ci/test: make generic fdo runner test jobs use the S3 artifacts too

These were the last users of the gitlab artifacts.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34710>
This commit is contained in:
Eric Engestrom
2025-04-21 19:53:43 +02:00
committed by Marge Bot
parent 1d7cce2700
commit 630aef6653
5 changed files with 12 additions and 5 deletions

View File

@@ -130,7 +130,7 @@ debian-testing-asan:
-D mesa-clc=system
-D tools=dlclose-skip
-D valgrind=disabled
S3_ARTIFACT_NAME: ""
S3_ARTIFACT_NAME: mesa-x86_64-asan-${BUILDTYPE}
ARTIFACTS_DEBUG_SYMBOLS: 1
RUN_MESON_TESTS: "false" # just too slow
# Do a host build for mesa-clc (asan complains not being loaded as

View File

@@ -3,11 +3,10 @@
interruptible: true
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
# `before_script:` is only used by test jobs on generic fdo runners
# it's overwritten by hardware test jobs
before_script:
- !reference [default, before_script]
# Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
- rm -rf install
- tar -xf artifacts/install.tar
- !reference [.download_s3, before_script]
- section_start ldd_section "Checking ldd on driver build"
- LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \;
- section_end ldd_section
@@ -128,6 +127,7 @@ yaml-toml-shell-py-test:
- !reference [.required-for-hardware-jobs, needs]
variables:
DEBIAN_ARCH: amd64
S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
.test-vk:
extends:
@@ -139,6 +139,7 @@ yaml-toml-shell-py-test:
- !reference [.required-for-hardware-jobs, needs]
variables:
DEBIAN_ARCH: amd64
S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
.test-cl:
extends:
@@ -147,6 +148,8 @@ yaml-toml-shell-py-test:
needs:
- debian/x86_64_test-gl
- !reference [.required-for-hardware-jobs, needs]
variables:
S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
.test-android:
extends:
@@ -156,6 +159,7 @@ yaml-toml-shell-py-test:
# This is for the guest artifacts from debian-android which will be
# downloaded explicitly by cuttlefish-runner.sh
S3_ANDROID_ARTIFACT_NAME: mesa-x86_64-android-debug
S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
# Set the default Vulkan driver to lavapipe for some preliminary checks
# that Cuttlefish always performs before starting the VM. This can be
# overwritten depending on the physical machine running the job.

View File

@@ -60,6 +60,7 @@ llvmpipe-deqp-asan:
# shared runners
LP_NUM_THREADS: 0
DEQP_FORCE_ASAN: 1
S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
extends: .llvmpipe-deqp-test
needs:
- debian/x86_64_test-gl

View File

@@ -22,6 +22,7 @@ softpipe-asan-gles31:
GPU_VERSION: softpipe-asan
DEQP_FRACTION: 10
DEQP_FORCE_ASAN: 1
S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
timeout: 10m
extends: .softpipe-deqp-test
needs:

View File

@@ -28,6 +28,7 @@ lavapipe-vk-asan:
DEQP_SUITE: lvp-asan
GPU_VERSION: lvp-asan
DEQP_FORCE_ASAN: 1
S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
needs:
- debian/x86_64_test-vk
- debian-testing-asan