ci: Skip check-only container jobs for pre-merge
For pre-merge pipelines, we know that we don't need to run the container-check jobs unless image-tags.yml has been modified. In this case, we can just skip the container jobs, because we 'know' that the containers are present in the upstream repo. For downstream or off-main pipelines, we still need to run the check job, because the changed-file tracking is not reliable on other branches, and because we may need to copy the container image from the upstream container storage into the user's namespace. Signed-off-by: Daniel Stone <daniels@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35203>
This commit is contained in:
@@ -199,7 +199,8 @@
|
||||
# Ensure that we are using the release build artifact
|
||||
S3_ARTIFACT_NAME: mesa-arm64-default-release
|
||||
needs:
|
||||
- debian/baremetal_arm64_test-gl
|
||||
- job: debian/baremetal_arm64_test-gl
|
||||
optional: true
|
||||
- debian-arm64-release
|
||||
dependencies: null
|
||||
|
||||
@@ -216,7 +217,8 @@
|
||||
# Ensure that we are using the release build artifact
|
||||
S3_ARTIFACT_NAME: mesa-arm64-default-release
|
||||
needs:
|
||||
- alpine/x86_64_lava-trigger
|
||||
- job: alpine/x86_64_lava-trigger
|
||||
optional: true
|
||||
- job: debian-arm64-release
|
||||
artifacts: false # we pull the artifacts from S3
|
||||
dependencies: null
|
||||
|
||||
@@ -6,8 +6,9 @@
|
||||
dependencies:
|
||||
- windows-msvc
|
||||
needs:
|
||||
- windows-msvc
|
||||
- windows_test_msvc
|
||||
- job: windows-msvc
|
||||
- job: windows_test_msvc
|
||||
optional: true
|
||||
- !reference [.required-for-hardware-jobs, needs]
|
||||
variables:
|
||||
GIT_STRATEGY: none # testing doesn't build anything from source
|
||||
|
||||
@@ -7,8 +7,9 @@ llvmpipe-piglit-rusticl:
|
||||
- .llvmpipe-rusticl-rules
|
||||
- .test-piglit
|
||||
needs:
|
||||
- debian-x86_64
|
||||
- debian/x86_64_test-gl
|
||||
- job: debian-x86_64
|
||||
- job: debian/x86_64_test-gl
|
||||
optional: true
|
||||
variables:
|
||||
DEQP_SUITE: llvmpipe-rusticl
|
||||
GPU_VERSION: llvmpipe-rusticl
|
||||
@@ -63,8 +64,9 @@ llvmpipe-deqp-asan:
|
||||
S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
|
||||
extends: .llvmpipe-deqp-test
|
||||
needs:
|
||||
- debian/x86_64_test-gl
|
||||
- debian-x86_64-asan
|
||||
- job: debian/x86_64_test-gl
|
||||
optional: true
|
||||
- job: debian-x86_64-asan
|
||||
|
||||
.android-llvmpipe:
|
||||
extends:
|
||||
|
||||
@@ -26,5 +26,6 @@ softpipe-asan-gles31:
|
||||
timeout: 10m
|
||||
extends: .softpipe-deqp-test
|
||||
needs:
|
||||
- debian/x86_64_test-gl
|
||||
- debian-x86_64-asan
|
||||
- job: debian/x86_64_test-gl
|
||||
optional: true
|
||||
- job: debian-x86_64-asan
|
||||
|
||||
@@ -30,8 +30,9 @@ lavapipe-vk-asan:
|
||||
DEQP_FORCE_ASAN: 1
|
||||
S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
|
||||
needs:
|
||||
- debian/x86_64_test-vk
|
||||
- debian-x86_64-asan
|
||||
- job: debian/x86_64_test-vk
|
||||
optional: true
|
||||
- job: debian-x86_64-asan
|
||||
|
||||
lavapipe-vkd3d:
|
||||
stage: software-renderer-nightly
|
||||
|
||||
@@ -130,8 +130,9 @@
|
||||
JOB_PRIORITY: 40
|
||||
S3_ARTIFACT_NAME: mesa-x86_64-default-release
|
||||
needs:
|
||||
- debian/x86_64_test-gl
|
||||
- debian-release
|
||||
- job: debian/x86_64_test-gl
|
||||
optional: true
|
||||
- job: debian-release
|
||||
|
||||
.anv-rules:
|
||||
stage: intel
|
||||
|
||||
@@ -10,8 +10,9 @@ test-spirv2dxil-windows:
|
||||
dependencies:
|
||||
- windows-msvc
|
||||
needs:
|
||||
- windows-msvc
|
||||
- windows_test_msvc
|
||||
- job: windows-msvc
|
||||
- job: windows_test_msvc
|
||||
optional: true
|
||||
- !reference [.required-for-hardware-jobs, needs]
|
||||
variables:
|
||||
GIT_STRATEGY: none # testing doesn't build anything from source
|
||||
@@ -32,8 +33,9 @@ test-dozen-deqp:
|
||||
dependencies:
|
||||
- windows-msvc
|
||||
needs:
|
||||
- windows-msvc
|
||||
- windows_test_msvc
|
||||
- job: windows-msvc
|
||||
- job: windows_test_msvc
|
||||
optional: true
|
||||
- !reference [.required-for-hardware-jobs, needs]
|
||||
variables:
|
||||
GIT_STRATEGY: none # testing doesn't build anything from source
|
||||
|
||||
Reference in New Issue
Block a user