From eae6e122ab71d3f27892523eeebd47da0cbde198 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 2 Sep 2024 11:40:14 +0100 Subject: [PATCH] ci/lava: Fix path to structured logger Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci/image-tags.yml | 2 +- .gitlab-ci/lava/lava_job_submitter.py | 2 +- .gitlab-ci/prepare-artifacts.sh | 1 + bin/ci/requirements.txt | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index a037221ac08..b430b9c655e 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,7 +16,7 @@ variables: DEBIAN_BASE_TAG: "20240729-rustc-bump" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "20240717-pyyaml-3" + DEBIAN_BUILD_TAG: "20240909-filelock" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base" diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py index 4aef2bfef30..29f36881960 100755 --- a/.gitlab-ci/lava/lava_job_submitter.py +++ b/.gitlab-ci/lava/lava_job_submitter.py @@ -51,7 +51,7 @@ from lava.utils import DEFAULT_GITLAB_SECTION_TIMEOUTS as GL_SECTION_TIMEOUTS STRUCTURAL_LOG = defaultdict(list) try: - from ci.structured_logger import StructuredLogger + from structured_logger import StructuredLogger except ImportError as e: print_log( f"Could not import StructuredLogger library: {e}. " diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh index 9607317a911..351c16f7eca 100755 --- a/.gitlab-ci/prepare-artifacts.sh +++ b/.gitlab-ci/prepare-artifacts.sh @@ -73,6 +73,7 @@ tar -cf artifacts/install.tar install cp -Rp .gitlab-ci/common artifacts/ci-common cp -Rp .gitlab-ci/lava artifacts/ cp -Rp .gitlab-ci/b2c artifacts/ +cp bin/ci/structured_logger.py artifacts/ if [ -n "$S3_ARTIFACT_NAME" ]; then # Pass needed files to the test stage diff --git a/bin/ci/requirements.txt b/bin/ci/requirements.txt index 77170882b42..44875ed6a30 100644 --- a/bin/ci/requirements.txt +++ b/bin/ci/requirements.txt @@ -1,5 +1,6 @@ colorama==0.4.* filecache==0.81 +filelock==3.* gql==3.* kaleido==0.2.* python-dateutil==2.*