From 054895fcdd72d2505b6d5038e25c9662b0901a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 14 Sep 2023 19:01:18 +0200 Subject: [PATCH] ci: cache: For consistency, read all used env vars MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of having some of them only being considered if explicitly passed to the script. Signed-off-by: Fabiano Fidêncio (cherry picked from commit adc18ecdb11056309afe9e38222f360944296025) --- .../kata-deploy-binaries-in-docker.sh | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh index 0cb0c0c630..47cf2dd1dd 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh @@ -77,32 +77,44 @@ docker build -q -t build-kata-deploy \ --build-arg HOST_DOCKER_GID=${docker_gid} \ "${script_dir}/dockerbuild/" +CI="${CI:-}" ARTEFACT_REGISTRY="${ARTEFACT_REGISTRY:-}" ARTEFACT_REGISTRY_USERNAME="${ARTEFACT_REGISTRY_USERNAME:-}" ARTEFACT_REGISTRY_PASSWORD="${ARTEFACT_REGISTRY_PASSWORD:-}" TARGET_BRANCH="${TARGET_BRANCH:-}" +BUILDER_REGISTRY="${BUILDER_REGISTRY:-}" +PUSH_TO_REGISTRY="${PUSH_TO_REGISTRY:-"no"}" +INITRAMFS_CONTAINER_BUILDER="${INITRAMFS_CONTAINER_BUILDER:-}" +KERNEL_CONTAINER_BUILDER="${KERNEL_CONTAINER_BUILDER:-}" +OVMF_CONTAINER_BUILDER="${OVMF_CONTAINER_BUILDER:-}" +QEMU_CONTAINER_BUILDER="${QEMU_CONTAINER_BUILDER:-}" +SHIM_V2_CONTAINER_BUILDER="${SHIM_V2_CONTAINER_BUILDER:-}" +TDSHIM_CONTAINER_BUILDER="${TDSHIM_CONTAINER_BUILDER:-}" +VIRTIOFSD_CONTAINER_BUILDER="${VIRTIOFSD_CONTAINER_BUILDER:-}" +MEASURED_ROOTFS="${MEASURED_ROOTFS:-}" +USE_CACHE="${USE_CACHE:-}" docker run \ -v $HOME/.docker:/root/.docker \ -v /var/run/docker.sock:/var/run/docker.sock \ -v "${kata_dir}:${kata_dir}" \ - --env CI="${CI:-}" \ + --env CI="${CI}" \ --env USER=${USER} \ --env ARTEFACT_REGISTRY="${ARTEFACT_REGISTRY}" \ --env ARTEFACT_REGISTRY_USERNAME="${ARTEFACT_REGISTRY_USERNAME}" \ --env ARTEFACT_REGISTRY_PASSWORD="${ARTEFACT_REGISTRY_PASSWORD}" \ --env TARGET_BRANCH="${TARGET_BRANCH}" \ --env BUILDER_REGISTRY="${BUILDER_REGISTRY}" \ - --env PUSH_TO_REGISTRY="${PUSH_TO_REGISTRY:-"no"}" \ - --env INITRAMFS_CONTAINER_BUILDER="${INITRAMFS_CONTAINER_BUILDER:-}" \ - --env KERNEL_CONTAINER_BUILDER="${KERNEL_CONTAINER_BUILDER:-}" \ - --env OVMF_CONTAINER_BUILDER="${OVMF_CONTAINER_BUILDER:-}" \ - --env QEMU_CONTAINER_BUILDER="${QEMU_CONTAINER_BUILDER:-}" \ - --env SHIM_V2_CONTAINER_BUILDER="${SHIM_V2_CONTAINER_BUILDER:-}" \ - --env TDSHIM_CONTAINER_BUILDER="${TDSHIM_CONTAINER_BUILDER:-}" \ - --env VIRTIOFSD_CONTAINER_BUILDER="${VIRTIOFSD_CONTAINER_BUILDER:-}" \ - --env MEASURED_ROOTFS="${MEASURED_ROOTFS:-}" \ - --env USE_CACHE="${USE_CACHE:-}" \ + --env PUSH_TO_REGISTRY="${PUSH_TO_REGISTRY}" \ + --env INITRAMFS_CONTAINER_BUILDER="${INITRAMFS_CONTAINER_BUILDER}" \ + --env KERNEL_CONTAINER_BUILDER="${KERNEL_CONTAINER_BUILDER}" \ + --env OVMF_CONTAINER_BUILDER="${OVMF_CONTAINER_BUILDER}" \ + --env QEMU_CONTAINER_BUILDER="${QEMU_CONTAINER_BUILDER}" \ + --env SHIM_V2_CONTAINER_BUILDER="${SHIM_V2_CONTAINER_BUILDER}" \ + --env TDSHIM_CONTAINER_BUILDER="${TDSHIM_CONTAINER_BUILDER}" \ + --env VIRTIOFSD_CONTAINER_BUILDER="${VIRTIOFSD_CONTAINER_BUILDER}" \ + --env MEASURED_ROOTFS="${MEASURED_ROOTFS}" \ + --env USE_CACHE="${USE_CACHE}" \ --env CROSS_BUILD="${CROSS_BUILD}" \ --env TARGET_ARCH="${TARGET_ARCH}" \ --env ARCH="${ARCH}" \