From 4f90e3c87ed38ea65616772ab736ee12c469db0f Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Wed, 17 Aug 2022 10:00:28 -0300 Subject: [PATCH 1/2] kata-deploy: add dockerbuild/install_yq.sh to gitignore The install_yq.sh is copied to tools/packaging/kata-deploy/local-build/dockerbuild so that it is added in the kata-deploy build image. Let's tell git to ignore that file. Signed-off-by: Wainer dos Santos Moschetta --- tools/packaging/kata-deploy/local-build/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/packaging/kata-deploy/local-build/.gitignore b/tools/packaging/kata-deploy/local-build/.gitignore index 567609b123..d8723ffc3f 100644 --- a/tools/packaging/kata-deploy/local-build/.gitignore +++ b/tools/packaging/kata-deploy/local-build/.gitignore @@ -1 +1,2 @@ build/ +dockerbuild/install_yq.sh From f7d41e98cb5b4e7ede1be2f4d5d500a644da8072 Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Wed, 17 Aug 2022 10:42:49 -0300 Subject: [PATCH 2/2] kata-deploy: export CI in the build container The clone_tests_repo() in ci/lib.sh relies on CI variable to decide whether to checkout the tests repository or not. So it is required to pass that variable down to the build container of kata-deploy, otherwise it can fail on some scenarios. Fixes #4949 Signed-off-by: Wainer dos Santos Moschetta --- .../kata-deploy/local-build/kata-deploy-binaries-in-docker.sh | 1 + 1 file changed, 1 insertion(+) 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 24d19c936f..237f256f26 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 @@ -40,6 +40,7 @@ docker build -q -t build-kata-deploy \ docker run \ -v /var/run/docker.sock:/var/run/docker.sock \ + --env CI="${CI:-}" \ --env USER=${USER} -v "${kata_dir}:${kata_dir}" \ --rm \ -w ${script_dir} \