diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 2c790b07c7b..efb6268098f 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -748,11 +748,11 @@ - !reference [.turnip-rules, rules] - !reference [.zink-common-rules, rules] -.zink-radv-rules: +.zink-radv-manual-rules: stage: layered-backends rules: - - !reference [.radv-rules, rules] - - !reference [.zink-common-rules, rules] + - !reference [.radv-valve-manual-rules, rules] + - !reference [.zink-common-manual-rules, rules] # Unfortunately YAML doesn't let us concatenate arrays, so we have to do the # rules duplication manually diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index 6d86b1384c3..5ddf253ad0d 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -127,7 +127,6 @@ zink-freedreno-a630-traces: ############### Combined testing (GL, GLES, Piglit) on RADV .radv-zink-test-valve: extends: - - .zink-radv-rules - .zink-test - .test-radv - .b2c-test-gl @@ -144,7 +143,7 @@ zink-radv-navi10-valve: extends: - .radv-zink-test-valve - .navi10-test-valve - - .radv-valve-manual-rules + - .zink-radv-manual-rules variables: GPU_VERSION: zink-radv-navi10 @@ -153,6 +152,6 @@ zink-radv-vangogh-valve: extends: - .radv-zink-test-valve - .vangogh-test-valve - - .radv-valve-manual-rules + - .zink-radv-manual-rules variables: GPU_VERSION: zink-radv-vangogh