Module: Mesa Branch: main Commit: 5499e857a33411e4f992aac7bbb5dc470bb2d608 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5499e857a33411e4f992aac7bbb5dc470bb2d608
Author: Eric Engestrom <[email protected]> Date: Thu Nov 16 20:26:27 2023 +0000 intel/ci: fix gl/vk dependencies in hsw jobs Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26237> --- src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml | 5 ++--- src/gallium/drivers/crocus/ci/gitlab-ci.yml | 2 ++ src/intel/ci/gitlab-ci.yml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml b/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml index 904535b2cf9..afbce1a1b1a 100644 --- a/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml @@ -2,7 +2,6 @@ .anholt-g41-test: extends: - .crocus-manual-rules - - .test-gl tags: - anholt-g41 variables: @@ -11,8 +10,6 @@ # Manual test rules for using anholt's shared hsw. .anholt-hsw-test: - extends: - - .test-gl tags: - anholt-hsw variables: @@ -22,6 +19,7 @@ .crocus-g41: extends: - .anholt-g41-test + - .test-gl - .deqp-test variables: DEQP_SUITE: crocus-g41 @@ -30,6 +28,7 @@ .crocus-g41-traces: extends: - .anholt-g41-test + - .test-gl - .piglit-traces-test variables: EGL_PLATFORM: "surfaceless" diff --git a/src/gallium/drivers/crocus/ci/gitlab-ci.yml b/src/gallium/drivers/crocus/ci/gitlab-ci.yml index f7fef8528cd..b93c268022b 100644 --- a/src/gallium/drivers/crocus/ci/gitlab-ci.yml +++ b/src/gallium/drivers/crocus/ci/gitlab-ci.yml @@ -4,6 +4,7 @@ include: crocus-hsw: extends: - .anholt-hsw-test + - .test-gl - .deqp-test - .crocus-manual-rules variables: @@ -14,6 +15,7 @@ crocus-hsw: crocus-hsw-traces: extends: - .anholt-hsw-test + - .test-gl - .piglit-traces-test - .crocus-manual-rules variables: diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index bf6face9640..806662ec7f6 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -45,6 +45,7 @@ anv-tgl-full: hasvk-hsw-full: extends: - .anholt-hsw-test + - .test-vk - .deqp-test - .hasvk-manual-rules variables:
