diff --git a/.github/workflows/docker-publish-latest-on-merge.yaml b/.github/workflows/docker-publish-latest-on-merge.yaml index 825ece95..4d9844dc 100644 --- a/.github/workflows/docker-publish-latest-on-merge.yaml +++ b/.github/workflows/docker-publish-latest-on-merge.yaml @@ -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 }} diff --git a/.github/workflows/docker-publish-on-tag.yaml b/.github/workflows/docker-publish-on-tag.yaml index 17c579a2..573fc55c 100644 --- a/.github/workflows/docker-publish-on-tag.yaml +++ b/.github/workflows/docker-publish-on-tag.yaml @@ -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 }} diff --git a/install/pre-install-payload/payload.sh b/install/pre-install-payload/payload.sh index 4e4565ce..d5a8439b 100755 --- a/install/pre-install-payload/payload.sh +++ b/install/pre-install-payload/payload.sh @@ -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() { @@ -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 } diff --git a/tests/e2e/ansible/group_vars/all b/tests/e2e/ansible/group_vars/all index 3a786520..b9a6eb6c 100644 --- a/tests/e2e/ansible/group_vars/all +++ b/tests/e2e/ansible/group_vars/all @@ -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) }}"