Skip to content

Commit

Permalink
Merging pull request 474
Browse files Browse the repository at this point in the history
Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>

* github.com:confidential-containers/operator:
  test: set ansible var properly for arm64 and x86 Co-authored-by: Huo Qifeng <huoqifeng1@jd.com> Co-authored-by: Seunguk Shin <seunguk.shin@outlook.com>
  actions: enable arm64 images for operator
  • Loading branch information
ldoktor committed Dec 16, 2024
2 parents 05ed81f + eb029aa commit dcefda3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish-latest-on-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ jobs:
with:
context: .
push: true
platforms: linux/amd64,linux/s390x
platforms: linux/amd64,linux/s390x,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish-on-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ jobs:
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
platforms: linux/amd64,linux/s390x
platforms: linux/amd64,linux/s390x,linux/arm64
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
5 changes: 5 additions & 0 deletions install/pre-install-payload/payload.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ registry="${registry:-quay.io/confidential-containers/reqs-payload}"
supported_arches=(
"linux/amd64"
"linux/s390x"
"linux/arm64"
)

function setup_env_for_arch() {
Expand All @@ -29,6 +30,10 @@ function setup_env_for_arch() {
kernel_arch="s390x"
golang_arch="s390x"
;;
"linux/arm64")
kernel_arch="aarch64"
golang_arch="arm64"
;;
*) echo "$1 is not supported" >/dev/stderr && exit 1 ;;
esac
}
Expand Down
5 changes: 4 additions & 1 deletion tests/e2e/ansible/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@ test_pkgs:
- jq
centos:
- jq
target_arch: "{{ 'amd64' if ansible_architecture == 'x86_64' else ansible_architecture }}"
binaries_architecture:
x86_64: amd64
aarch64: arm64
target_arch: "{{ binaries_architecture[ansible_architecture] | default(ansible_architecture) }}"

0 comments on commit dcefda3

Please sign in to comment.