mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 10:14:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci/lava: Fix path to structured logger

Browse Source 
Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30978>
This commit is contained in:
Daniel Stone 2024-09-02 11:40:14 +01:00 committed by Marge Bot
parent ee73094957
commit eae6e122ab
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/image-tags.yml
View File

@ -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"

2
.gitlab-ci/lava/lava_job_submitter.py
View File

@ -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}. "

1
.gitlab-ci/prepare-artifacts.sh
View File

@ -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

1
bin/ci/requirements.txt
View File

@ -1,5 +1,6 @@
colorama==0.4.*
filecache==0.81
filelock==3.*
gql==3.*
kaleido==0.2.*
python-dateutil==2.*