From: Emma Anholt Date: Thu, 9 Mar 2023 20:56:44 +0000 (-0800) Subject: Revert "ci: disable mesa-swrast runner jobs" X-Git-Tag: upstream/23.3.3~11862 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ae0d9d2e8a9f0993b056a332e6182e5c655be73;p=platform%2Fupstream%2Fmesa.git Revert "ci: disable mesa-swrast runner jobs" This reverts commit aef0f3efdfbcaaea78f2eb2315b064d92117abae. We've got a new set of runners now (mesa-swrast-4, 5, and 7 because counting is hard) Part-of: --- diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index dba4d73c..fa98a41 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 b24dce8..c3468bb 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 054a43c..14dfa38 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 0f7acfe..0bb0529 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 83c66d3..5b0927f 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 78f7abd..a7117e8 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