Merge pull request #10123 from fidencio/topic/re-enable-arm-ci

ci: re-enable arm CI
This commit is contained in:
Fabiano Fidêncio 2024-08-02 17:48:35 +02:00 committed by GitHub
commit b93a0642e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 38 additions and 19 deletions

View File

@ -36,6 +36,25 @@ jobs:
target-branch: ${{ inputs.target-branch }}
secrets: inherit
build-kata-static-tarball-arm64:
uses: ./.github/workflows/build-kata-static-tarball-arm64.yaml
with:
tarball-suffix: -${{ inputs.tag }}
commit-hash: ${{ inputs.commit-hash }}
target-branch: ${{ inputs.target-branch }}
publish-kata-deploy-payload-arm64:
needs: build-kata-static-tarball-arm64
uses: ./.github/workflows/publish-kata-deploy-payload-arm64.yaml
with:
tarball-suffix: -${{ inputs.tag }}
registry: ghcr.io
repo: ${{ github.repository_owner }}/kata-deploy-ci
tag: ${{ inputs.tag }}-arm64
commit-hash: ${{ inputs.commit-hash }}
target-branch: ${{ inputs.target-branch }}
secrets: inherit
build-kata-static-tarball-s390x:
uses: ./.github/workflows/build-kata-static-tarball-s390x.yaml
with:

View File

@ -17,13 +17,13 @@ jobs:
target-branch: ${{ github.ref_name }}
secrets: inherit
# build-assets-arm64:
# uses: ./.github/workflows/build-kata-static-tarball-arm64.yaml
# with:
# commit-hash: ${{ github.sha }}
# push-to-registry: yes
# target-branch: ${{ github.ref_name }}
# secrets: inherit
build-assets-arm64:
uses: ./.github/workflows/build-kata-static-tarball-arm64.yaml
with:
commit-hash: ${{ github.sha }}
push-to-registry: yes
target-branch: ${{ github.ref_name }}
secrets: inherit
build-assets-s390x:
uses: ./.github/workflows/build-kata-static-tarball-s390x.yaml
@ -52,16 +52,16 @@ jobs:
target-branch: ${{ github.ref_name }}
secrets: inherit
# publish-kata-deploy-payload-arm64:
# needs: build-assets-arm64
# uses: ./.github/workflows/publish-kata-deploy-payload-arm64.yaml
# with:
# commit-hash: ${{ github.sha }}
# registry: quay.io
# repo: kata-containers/kata-deploy-ci
# tag: kata-containers-latest-arm64
# target-branch: ${{ github.ref_name }}
# secrets: inherit
publish-kata-deploy-payload-arm64:
needs: build-assets-arm64
uses: ./.github/workflows/publish-kata-deploy-payload-arm64.yaml
with:
commit-hash: ${{ github.sha }}
registry: quay.io
repo: kata-containers/kata-deploy-ci
tag: kata-containers-latest-arm64
target-branch: ${{ github.ref_name }}
secrets: inherit
publish-kata-deploy-payload-s390x:
needs: build-assets-s390x
@ -87,8 +87,7 @@ jobs:
publish-manifest:
runs-on: ubuntu-latest
# needs: [publish-kata-deploy-payload-amd64, publish-kata-deploy-payload-arm64, publish-kata-deploy-payload-s390x, publish-kata-deploy-payload-ppc64le]
needs: [publish-kata-deploy-payload-amd64, publish-kata-deploy-payload-s390x, publish-kata-deploy-payload-ppc64le]
needs: [publish-kata-deploy-payload-amd64, publish-kata-deploy-payload-arm64, publish-kata-deploy-payload-s390x, publish-kata-deploy-payload-ppc64le]
steps:
- name: Checkout repository
uses: actions/checkout@v4

View File

@ -142,6 +142,7 @@ function _publish_multiarch_manifest()
for tag in ${IMAGE_TAGS[@]}; do
docker manifest create ${registry}:${tag} \
--amend ${registry}:${tag}-amd64 \
--amend ${registry}:${tag}-arm64 \
--amend ${registry}:${tag}-s390x \
--amend ${registry}:${tag}-ppc64le