From 08be9c36011fb7f1ef48a648ca585ae4e996afdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 2 Aug 2024 13:52:53 +0200 Subject: [PATCH 1/3] Revert "ci: Temporarily remove arm64 builds -- part II" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c5dad991cecdeb3a3fe404694c636fc1ce1a282e, as there are now 2 arm64-builders (to be expanded to 4 really soon). Signed-off-by: Fabiano Fidêncio --- tools/packaging/release/release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/packaging/release/release.sh b/tools/packaging/release/release.sh index b1eedb86a1..63deee42e3 100755 --- a/tools/packaging/release/release.sh +++ b/tools/packaging/release/release.sh @@ -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 From 388b5b0e58946f8658898e1514b4e616797477bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 2 Aug 2024 13:53:50 +0200 Subject: [PATCH 2/3] Revert "ci: Temporarily remove arm64 builds" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e9710332e74bca35a28f432bd4c9af1c353d5eb1, as there are now 2 arm64-builders (to be expanded to 4 really soon). Signed-off-by: Fabiano Fidêncio --- .github/workflows/payload-after-push.yaml | 37 +++++++++++------------ tools/packaging/release/release.sh | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/payload-after-push.yaml b/.github/workflows/payload-after-push.yaml index 9ce134471d..588afb4a3b 100644 --- a/.github/workflows/payload-after-push.yaml +++ b/.github/workflows/payload-after-push.yaml @@ -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 diff --git a/tools/packaging/release/release.sh b/tools/packaging/release/release.sh index 63deee42e3..4cd655f2ee 100755 --- a/tools/packaging/release/release.sh +++ b/tools/packaging/release/release.sh @@ -142,7 +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}-arm64 \ --amend ${registry}:${tag}-s390x \ --amend ${registry}:${tag}-ppc64le From ed57ef02978fd098aa2f88c0044f6bc232243d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 2 Aug 2024 14:13:53 +0200 Subject: [PATCH 3/3] ci; aarch64: Enable builders as part of the CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As we have new runners added, let's enable the builders so we can prevent build failures happening after something gets merged. Signed-off-by: Fabiano Fidêncio --- .github/workflows/ci.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d1cf0aa83c..d61fe2c028 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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: