From 684a6e1a5514ac4617a6a40a486cc97167053e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 31 Jul 2023 14:37:10 +0200 Subject: [PATCH 1/2] Revert "gha: release: `stage` must be a string" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7c857d38c1dae8db7b4d41fe08f0701f988cda3b. I've misunderstood the error given by github action, let's fix this in the next commit. Signed-off-by: Fabiano Fidêncio --- .github/workflows/build-kata-static-tarball-amd64.yaml | 2 +- .github/workflows/release-amd64.yaml | 2 +- .github/workflows/release-arm64.yaml | 2 +- .github/workflows/release-s390x.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index a07b1c8fea..869d49bc60 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -51,7 +51,7 @@ jobs: - ${{ inputs.stage }} exclude: - asset: cloud-hypervisor-glibc - stage: "release" + stage: release steps: - name: Login to Kata Containers quay.io if: ${{ inputs.push-to-registry == 'yes' }} diff --git a/.github/workflows/release-amd64.yaml b/.github/workflows/release-amd64.yaml index 7b0782ddc6..6ff9906969 100644 --- a/.github/workflows/release-amd64.yaml +++ b/.github/workflows/release-amd64.yaml @@ -10,7 +10,7 @@ jobs: build-kata-static-tarball-amd64: uses: ./.github/workflows/build-kata-static-tarball-amd64.yaml with: - stage: "release" + stage: release kata-deploy: needs: build-kata-static-tarball-amd64 diff --git a/.github/workflows/release-arm64.yaml b/.github/workflows/release-arm64.yaml index 9fabba3c9c..cd7db8fdfb 100644 --- a/.github/workflows/release-arm64.yaml +++ b/.github/workflows/release-arm64.yaml @@ -10,7 +10,7 @@ jobs: build-kata-static-tarball-arm64: uses: ./.github/workflows/build-kata-static-tarball-arm64.yaml with: - stage: "release" + stage: release kata-deploy: needs: build-kata-static-tarball-arm64 diff --git a/.github/workflows/release-s390x.yaml b/.github/workflows/release-s390x.yaml index 3bf3394a88..5f3aaf05fb 100644 --- a/.github/workflows/release-s390x.yaml +++ b/.github/workflows/release-s390x.yaml @@ -10,7 +10,7 @@ jobs: build-kata-static-tarball-s390x: uses: ./.github/workflows/build-kata-static-tarball-s390x.yaml with: - stage: "release" + stage: release kata-deploy: needs: build-kata-static-tarball-s390x From 1b111a9aab4daeb6facea67b7b3ac28e646720b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 31 Jul 2023 14:41:35 +0200 Subject: [PATCH 2/2] gha: release: `stage` must be defined for arm64 / s390x yamls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `stage` has been added, but only hooked up to the amd64 logic, leaving arm64 and s390x behind. Let's fix this right now, and make sure no error occurs when passing this down to the yaml files. Fixes: #7497 Signed-off-by: Fabiano Fidêncio --- .github/workflows/build-kata-static-tarball-arm64.yaml | 6 ++++++ .github/workflows/build-kata-static-tarball-s390x.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/build-kata-static-tarball-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml index 85d7bd18b8..cafc6e0200 100644 --- a/.github/workflows/build-kata-static-tarball-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -2,6 +2,10 @@ name: CI | Build kata-static tarball for arm64 on: workflow_call: inputs: + stage: + required: false + type: string + default: test tarball-suffix: required: false type: string @@ -29,6 +33,8 @@ jobs: - rootfs-initrd - shim-v2 - virtiofsd + stage: + - ${{ inputs.stage }} steps: - name: Adjust a permission for repo run: | diff --git a/.github/workflows/build-kata-static-tarball-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml index 8c7b886370..0fe7e9200d 100644 --- a/.github/workflows/build-kata-static-tarball-s390x.yaml +++ b/.github/workflows/build-kata-static-tarball-s390x.yaml @@ -2,6 +2,10 @@ name: CI | Build kata-static tarball for s390x on: workflow_call: inputs: + stage: + required: false + type: string + default: test tarball-suffix: required: false type: string @@ -25,6 +29,8 @@ jobs: - rootfs-initrd - shim-v2 - virtiofsd + stage: + - ${{ inputs.stage }} steps: - name: Adjust a permission for repo run: |