From ea354d9a8a2b4b0260c88b5bb93b1a18fe81b9b7 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 26 Jun 2023 12:12:29 +0200 Subject: [PATCH] ci-automation: Align CONTAINER_*_ROOT with usual location The SDK container bind mounts __build__/images to the containers image directory, but the CI uses a different path for images. This causes issues when building the oem sysext, because it requires mounting an overlayfs. The current path (~/build/...) is an overlayfs and an ovlerayfs can't be an upper directory. Align the CONTAINER_IMAGE_ROOT and CONTAINER_TORCX_ROOT values with standard practices to that oem sysext building in jenkins ci works. Signed-off-by: Jeremi Piotrowski --- ci-automation/ci-config.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-automation/ci-config.env b/ci-automation/ci-config.env index 5ddc05accc..5773a4c1c6 100644 --- a/ci-automation/ci-config.env +++ b/ci-automation/ci-config.env @@ -28,8 +28,8 @@ CI_GIT_AUTHOR="flatcar-ci" CI_GIT_EMAIL="infra+ci@flatcar-linux.org" # build artifacts go here (in container) -CONTAINER_TORCX_ROOT="/home/sdk/build/torcx" -CONTAINER_IMAGE_ROOT="/home/sdk/build/images" +CONTAINER_TORCX_ROOT="/home/sdk/trunk/src/build/torcx" +CONTAINER_IMAGE_ROOT="/home/sdk/trunk/src/build/images" # Set it to "1" or "true" or "t" or "y" or "yes" to always run a full # nightly build. Any other value will allow build shortcuts.