Mesa (main): ci/i915: Merge the piglit and deqp runs.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 5d0f36d8269a33878bf3467851fd932718326406
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d0f36d8269a33878bf3467851fd932718326406

Author: Emma Anholt <emma at anholt.net>
Date:   Mon Jun  6 12:51:14 2022 -0700

ci/i915: Merge the piglit and deqp runs.

One less button to click.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16896>

---

 src/gallium/drivers/i915/ci/deqp-i915g.toml |  9 +++++++++
 src/gallium/drivers/i915/ci/gitlab-ci.yml   | 10 +---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/i915/ci/deqp-i915g.toml b/src/gallium/drivers/i915/ci/deqp-i915g.toml
index dec2e8628d5..21d62f610ee 100644
--- a/src/gallium/drivers/i915/ci/deqp-i915g.toml
+++ b/src/gallium/drivers/i915/ci/deqp-i915g.toml
@@ -21,3 +21,12 @@ deqp_args = [
     "--deqp-gl-config-name=rgba8888d24s8ms0",
     "--deqp-visibility=hidden"
 ]
+
+[[piglit]]
+piglit_folder = "/piglit"
+# We use "gpu" to skip running glslparser tests, with the assumption that
+# they're covered by the llvmpipe run.
+profile = "gpu"
+process_isolation = true
+  [piglit.env]
+  PIGLIT_PLATFORM = "gbm"
diff --git a/src/gallium/drivers/i915/ci/gitlab-ci.yml b/src/gallium/drivers/i915/ci/gitlab-ci.yml
index f436281bf88..acfaa098b44 100644
--- a/src/gallium/drivers/i915/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/i915/ci/gitlab-ci.yml
@@ -10,21 +10,13 @@
     GPU_VERSION: i915-g33
     FLAKES_CHANNEL: "#intel-ci"
 
-i915-g33-deqp:
+i915-g33:
   extends:
     - .anholt-g33-test
     - .deqp-test
   variables:
     DEQP_SUITE: i915g
 
-i915-g33-piglit:
-  extends:
-    - .anholt-g33-test
-    - .piglit-test
-  variables:
-    PIGLIT_PROFILES: gpu
-    PIGLIT_PLATFORM: gbm
-
 i915-g33-traces:
   extends:
     - .anholt-g33-test