From 6ea036987841c9ff87573b09a6de62a035d32069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 24 Oct 2024 16:21:52 +0200 Subject: [PATCH] workflows: build: Ensure rootfs is built before shim-v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the rootfs will have what we need to add as part of the shim-v2 configuration files for measured rootfs, we **must** ensure this is built **before** shim-v2. Signed-off-by: Fabiano Fidêncio --- .github/workflows/build-kata-static-tarball-amd64.yaml | 2 +- .github/workflows/build-kata-static-tarball-arm64.yaml | 2 +- .github/workflows/build-kata-static-tarball-ppc64le.yaml | 2 +- .github/workflows/build-kata-static-tarball-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 abd8edd08b..f4c761e9e3 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -203,7 +203,7 @@ jobs: build-asset-shim-v2: runs-on: ubuntu-22.04 - needs: build-asset + needs: [build-asset, build-asset-rootfs] steps: - name: Login to Kata Containers quay.io if: ${{ inputs.push-to-registry == 'yes' }} diff --git a/.github/workflows/build-kata-static-tarball-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml index f7d5649948..d0a38d98c8 100644 --- a/.github/workflows/build-kata-static-tarball-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -143,7 +143,7 @@ jobs: build-asset-shim-v2: runs-on: arm64-builder - needs: build-asset + needs: [build-asset, build-asset-rootfs] steps: - name: Login to Kata Containers quay.io if: ${{ inputs.push-to-registry == 'yes' }} diff --git a/.github/workflows/build-kata-static-tarball-ppc64le.yaml b/.github/workflows/build-kata-static-tarball-ppc64le.yaml index 77607d8789..a1838b1b8c 100644 --- a/.github/workflows/build-kata-static-tarball-ppc64le.yaml +++ b/.github/workflows/build-kata-static-tarball-ppc64le.yaml @@ -151,7 +151,7 @@ jobs: build-asset-shim-v2: runs-on: ppc64le - needs: build-asset + needs: [build-asset, build-asset-rootfs] steps: - name: Prepare the self-hosted runner run: | diff --git a/.github/workflows/build-kata-static-tarball-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml index b948bf3925..aee654d764 100644 --- a/.github/workflows/build-kata-static-tarball-s390x.yaml +++ b/.github/workflows/build-kata-static-tarball-s390x.yaml @@ -219,7 +219,7 @@ jobs: build-asset-shim-v2: runs-on: s390x - needs: build-asset + needs: [build-asset, build-asset-rootfs] steps: - name: Login to Kata Containers quay.io if: ${{ inputs.push-to-registry == 'yes' }}