From ca2098f8285b24e0c32a73f3d342b9d825459210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 28 Nov 2024 11:08:13 +0100 Subject: [PATCH 1/2] build: Allow dummy builds (for when adding a new target) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will help us to simply allow a new dummy build whenever a new component is added. As long as the format `$(call DUMMY,$@)` is followed, we should be good to go without taking the risk of breaking the CI. Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/local-build/Makefile | 7 ++++++- .../kata-deploy/local-build/kata-deploy-binaries.sh | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 3ba48db12..77a1660b9 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -54,6 +54,11 @@ define BUILD $(MK_DIR)/kata-deploy-binaries-in-docker.sh $(if $(V),,-s) --build=$1 endef +define DUMMY + $(call BUILD,"dummy") + mv $(MK_DIR)/build/kata-static-dummy.tar.xz $(MK_DIR)/build/kata-static-$(patsubst %-tarball,%,$1).tar.xz +endef + kata-tarball: | all-parallel merge-builds copy-scripts-for-the-agent-build: @@ -94,7 +99,7 @@ cloud-hypervisor-glibc-tarball: ${MAKE} $@-build csi-kata-directvolume-tarball: copy-scripts-for-the-tools-build - exit 0 + $(call DUMMY,$@) firecracker-tarball: ${MAKE} $@-build diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 69053f3d4..43d256f0f 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -1191,6 +1191,10 @@ handle_build() { virtiofsd) install_virtiofsd ;; + dummy) + tar cvfJ ${final_tarball_path} --files-from /dev/null + ;; + *) die "Invalid build target ${build_target}" ;; @@ -1365,6 +1369,7 @@ main() { shim-v2 trace-forwarder virtiofsd + dummy ) silent=false while getopts "hs-:" opt; do From 92b8091f628647d212fd5a07fc21fb652700fe61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 28 Nov 2024 12:01:42 +0100 Subject: [PATCH 2/2] Revert "ci: unbreak: Reallow no-op builds" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 559018554bbeb75a565e7fadc57a1c0b74081a1b. As we've noticed that this is causing issues with initrd builds in the CI. Signed-off-by: Fabiano Fidêncio --- .github/workflows/build-kata-static-tarball-amd64.yaml | 6 +++--- .github/workflows/build-kata-static-tarball-arm64.yaml | 6 +++--- .github/workflows/build-kata-static-tarball-ppc64le.yaml | 6 +++--- .github/workflows/build-kata-static-tarball-s390x.yaml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index db62e2b99..b72a2d681 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -89,7 +89,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -181,7 +181,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -252,7 +252,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz diff --git a/.github/workflows/build-kata-static-tarball-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml index 60a11d620..2291894e4 100644 --- a/.github/workflows/build-kata-static-tarball-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -61,7 +61,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -121,7 +121,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -189,7 +189,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz diff --git a/.github/workflows/build-kata-static-tarball-ppc64le.yaml b/.github/workflows/build-kata-static-tarball-ppc64le.yaml index 00907130e..6ac723cb9 100644 --- a/.github/workflows/build-kata-static-tarball-ppc64le.yaml +++ b/.github/workflows/build-kata-static-tarball-ppc64le.yaml @@ -63,7 +63,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -129,7 +129,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -202,7 +202,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz diff --git a/.github/workflows/build-kata-static-tarball-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml index 7b3f193aa..72304b81e 100644 --- a/.github/workflows/build-kata-static-tarball-s390x.yaml +++ b/.github/workflows/build-kata-static-tarball-s390x.yaml @@ -67,7 +67,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -153,7 +153,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: ${{ matrix.asset }} TAR_OUTPUT: ${{ matrix.asset }}.tar.gz @@ -268,7 +268,7 @@ jobs: make "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink - cp -r --no-clobber "${build_dir}" "kata-build" + mkdir -p kata-build && cp "${build_dir}"/kata-static-${KATA_ASSET}*.tar.* kata-build/. env: KATA_ASSET: shim-v2 TAR_OUTPUT: shim-v2.tar.gz