From 3e86f3a95c6dda3137b22510a754cb4eea2ed120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 15 Jul 2025 14:48:45 +0200 Subject: [PATCH] build: Rename rootfs-nvidia-* to fix cache issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The convention for rootfs-* names is: * rootfs-${image_type}-${special_build} If this is not followed, cache will never work as expected, leading to building the initrd / image on every single build, which is specially constly when building the nvidia specific targets. Signed-off-by: Fabiano Fidêncio --- .github/workflows/build-kata-static-tarball-amd64.yaml | 4 ++-- .github/workflows/build-kata-static-tarball-arm64.yaml | 2 +- tools/packaging/kata-deploy/local-build/Makefile | 8 ++++---- .../kata-deploy/local-build/kata-deploy-binaries.sh | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index 86dcc3d95c..f4e761b1bf 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -168,8 +168,8 @@ jobs: - rootfs-image-mariner - rootfs-initrd - rootfs-initrd-confidential - - rootfs-nvidia-gpu-initrd - - rootfs-nvidia-gpu-confidential-initrd + - rootfs-initrd-nvidia-gpu + - rootfs-initrd-nvidia-gpu-confidential 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 71142a39a4..58609159ad 100644 --- a/.github/workflows/build-kata-static-tarball-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -145,7 +145,7 @@ jobs: asset: - rootfs-image - rootfs-initrd - - rootfs-nvidia-gpu-initrd + - rootfs-initrd-nvidia-gpu steps: - name: Login to Kata Containers quay.io if: ${{ inputs.push-to-registry == 'yes' }} diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index d6aa51bd07..bd1fb7031b 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -176,16 +176,16 @@ rootfs-initrd-tarball: agent-tarball runk-tarball: copy-scripts-for-the-tools-build ${MAKE} $@-build -rootfs-nvidia-gpu-image-tarball: agent-tarball busybox-tarball kernel-nvidia-gpu-tarball +rootfs-image-nvidia-gpu-tarball: agent-tarball busybox-tarball kernel-nvidia-gpu-tarball ${MAKE} $@-build -rootfs-nvidia-gpu-initrd-tarball: agent-tarball busybox-tarball kernel-nvidia-gpu-tarball +rootfs-initrd-nvidia-gpu-tarball: agent-tarball busybox-tarball kernel-nvidia-gpu-tarball ${MAKE} $@-build -rootfs-nvidia-gpu-confidential-image-tarball: agent-tarball busybox-tarball pause-image-tarball coco-guest-components-tarball kernel-nvidia-gpu-confidential-tarball +rootfs-image-nvidia-gpu-confidential-tarball: agent-tarball busybox-tarball pause-image-tarball coco-guest-components-tarball kernel-nvidia-gpu-confidential-tarball ${MAKE} $@-build -rootfs-nvidia-gpu-confidential-initrd-tarball: agent-tarball busybox-tarball pause-image-tarball coco-guest-components-tarball kernel-nvidia-gpu-confidential-tarball +rootfs-initrd-nvidia-gpu-confidential-tarball: agent-tarball busybox-tarball pause-image-tarball coco-guest-components-tarball kernel-nvidia-gpu-confidential-tarball ${MAKE} $@-build shim-v2-tarball: 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 902497481f..ce8137af2b 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -1265,13 +1265,13 @@ handle_build() { rootfs-initrd-confidential) install_initrd_confidential ;; - rootfs-nvidia-gpu-image) install_image_nvidia_gpu ;; + rootfs-image-nvidia-gpu) install_image_nvidia_gpu ;; - rootfs-nvidia-gpu-initrd) install_initrd_nvidia_gpu ;; + rootfs-initrd-nvidia-gpu) install_initrd_nvidia_gpu ;; - rootfs-nvidia-gpu-confidential-image) install_image_nvidia_gpu_confidential ;; + rootfs-image-nvidia-gpu-confidential) install_image_nvidia_gpu_confidential ;; - rootfs-nvidia-gpu-confidential-initrd) install_initrd_nvidia_gpu_confidential ;; + rootfs-initrd-nvidia-gpu-confidential) install_initrd_nvidia_gpu_confidential ;; runk) install_runk ;;