From e5b29e6735f7cf7025d9a0b2e214cb73a98e72bc Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 10 Mar 2023 07:07:27 -0500 Subject: [PATCH] Revert "Revert "ci: disable mesa-swrast runner jobs"" This reverts commit 7ae0d9d2e8a9f0993b056a332e6182e5c655be73. Part-of: --- src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 2 +- src/gallium/drivers/softpipe/ci/gitlab-ci.yml | 2 +- src/gallium/drivers/virgl/ci/gitlab-ci.yml | 2 +- src/gallium/drivers/zink/ci/gitlab-ci.yml | 2 +- src/gallium/frontends/lavapipe/ci/gitlab-ci.yml | 2 +- src/virtio/ci/gitlab-ci.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index fa98a41..dba4d73c 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -60,7 +60,7 @@ llvmpipe-traces: - .deqp-test - .llvmpipe-test -llvmpipe: +.llvmpipe: tags: - mesa-swrast variables: diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml index c3468bb..b24dce8 100644 --- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml @@ -15,7 +15,7 @@ variables: DEQP_EXPECTED_RENDERER: softpipe -softpipe: +.softpipe: tags: - mesa-swrast variables: diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index 14dfa38..054a43c 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -8,7 +8,7 @@ script: - xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && GALLIUM_DRIVER=virpipe install/deqp-runner.sh" -virpipe-on-gl: +.virpipe-on-gl: extends: - .deqp-test - .virpipe-test diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index 0bb0529..0f7acfe 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -27,7 +27,7 @@ # Fix non-conformant llvmpipe filter defaults GALLIVM_PERF: "no_quad_lod" -zink-lvp: +.zink-lvp: tags: - mesa-swrast extends: diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml index 5b0927f..83c66d3 100644 --- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml +++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml @@ -9,7 +9,7 @@ DEQP_EXPECTED_RENDERER: llvmpipe LVP_POISON_MEMORY: "1" -lavapipe: +.lavapipe: tags: - mesa-swrast variables: diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml index a7117e8..78f7abd 100644 --- a/src/virtio/ci/gitlab-ci.yml +++ b/src/virtio/ci/gitlab-ci.yml @@ -8,7 +8,7 @@ CROSVM_VK_DRIVER: "lvp" CROSVM_GPU_ARGS: "vulkan=true,gles=false,backend=virglrenderer,egl=true,surfaceless=true" -venus-lavapipe: +.venus-lavapipe: extends: - .deqp-test-vk - .venus-lavapipe-test -- 2.7.4