From 02203482503516f664560011c13a360e7366c1e7 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Thu, 12 May 2022 13:22:17 -0700
Subject: [PATCH] ci/crocus: Merge the piglit runs with the deqp runs.

Fewer manual buttons to click.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16390>
---
 .../drivers/crocus/ci/deqp-crocus-g41.toml    |  9 ++++++
 .../drivers/crocus/ci/deqp-crocus-hsw.toml    |  9 ++++++
 src/gallium/drivers/crocus/ci/gitlab-ci.yml   | 28 ++-----------------
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml b/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml
index b0b6d16fa60..00ad082fc8d 100644
--- a/src/gallium/drivers/crocus/ci/deqp-crocus-g41.toml
+++ b/src/gallium/drivers/crocus/ci/deqp-crocus-g41.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/crocus/ci/deqp-crocus-hsw.toml b/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml
index 36030a7b2bc..129c07ab910 100644
--- a/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml
+++ b/src/gallium/drivers/crocus/ci/deqp-crocus-hsw.toml
@@ -60,3 +60,12 @@ deqp_args = [
     "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
     "--deqp-gl-config-name=rgba8888d24s8ms0",
 ]
+
+[[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/crocus/ci/gitlab-ci.yml b/src/gallium/drivers/crocus/ci/gitlab-ci.yml
index 5bcae5009da..552c33e0d57 100644
--- a/src/gallium/drivers/crocus/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/crocus/ci/gitlab-ci.yml
@@ -22,44 +22,20 @@
     GPU_VERSION: crocus-hsw
     FDO_CI_CONCURRENT: 12
 
-crocus-g41-deqp:
+crocus-g41:
   extends:
     - .anholt-g41-test
     - .deqp-test
   variables:
     DEQP_SUITE: crocus-g41
 
-crocus-hsw-deqp:
+crocus-hsw:
   extends:
     - .anholt-hsw-test
     - .deqp-test
   variables:
     DEQP_SUITE: crocus-hsw
 
-.crocus-piglit-test:
-  variables:
-    PIGLIT_PROFILES: gpu
-    PIGLIT_PLATFORM: gbm
-  artifacts:
-    paths:
-      - results/
-    reports:
-      junit: results/junit.xml
-  script:
-    - install/piglit/piglit-runner.sh
-
-crocus-g41-piglit:
-  extends:
-    - .anholt-g41-test
-    - .piglit-test
-    - .crocus-piglit-test
-
-crocus-hsw-piglit:
-  extends:
-    - .anholt-hsw-test
-    - .piglit-test
-    - .crocus-piglit-test
-
 crocus-g41-traces:
   extends:
     - .anholt-g41-test