Mesa (master): ci: add Vulkan piglit traces jobs and remove tracie ones

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 8860fa931ef8dec56fb2148111a42841ad376b79
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8860fa931ef8dec56fb2148111a42841ad376b79

Author: Andres Gomez <agomez at igalia.com>
Date:   Thu Aug 27 20:33:10 2020 +0300

ci: add Vulkan piglit traces jobs and remove tracie ones

v2:
  - Rename *-piglit-traces jobs with *-traces.

Signed-off-by: Andres Gomez <agomez at igalia.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com> [v1]
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6388>

---

 .gitlab-ci.yml                              | 67 +++++++++++------------------
 .gitlab-ci/piglit/radv-polaris10-replay.txt | 16 +++++++
 .gitlab-ci/piglit/radv-raven-replay.txt     | 16 +++++++
 3 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3276255e941..526414850f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1127,6 +1127,32 @@ virgl-traces:
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"
 
+radv-polaris10-traces:
+  extends:
+    - .piglit-traces-test
+    - .test-vk
+    - .test-radv
+    - .test-manual
+  variables:
+    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-radv.yml"
+    PIGLIT_REPLAY_DEVICE_NAME: "vk-amd-polaris10"
+    PIGLIT_RESULTS: "radv-polaris10-replay"
+  tags:
+    - polaris10
+
+radv-raven-traces:
+  extends:
+    - .piglit-traces-test
+    - .test-vk
+    - .test-radv
+    - .test-manual
+  variables:
+    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-radv.yml"
+    PIGLIT_REPLAY_DEVICE_NAME: "vk-amd-raven"
+    PIGLIT_RESULTS: "radv-raven-replay"
+  tags:
+    - raven
+
 .deqp-test:
   script:
     - ./install/deqp-runner.sh
@@ -1525,44 +1551,3 @@ radv-fossils:
     # Sienna Cichlid (GFX10)
     - export RADV_FORCE_FAMILY="gfx1030"
     - ./install/fossilize-runner.sh
-
-# Traces CI
-.traces-test:
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - traces-db/
-  variables:
-    TRACIE_UPLOAD_TO_MINIO: 1
-  artifacts:
-    reports:
-      junit: results/junit.xml
-
-.traces-test-vk:
-  extends:
-    - .test-vk
-    - .traces-test
-  script:
-    - ./install/tracie-runner-vk.sh
-
-radv-polaris10-traces:
-  extends:
-    - .traces-test-vk
-    - .test-radv
-    - .test-manual
-  variables:
-    DEVICE_NAME: "vk-amd-polaris10"
-    DRIVER_NAME: "radv"
-  tags:
-    - polaris10
-
-radv-raven-traces:
-  extends:
-    - .traces-test-vk
-    - .test-radv
-    - .test-manual
-  variables:
-    DEVICE_NAME: "vk-amd-raven"
-    DRIVER_NAME: "radv"
-  tags:
-    - raven
diff --git a/.gitlab-ci/piglit/radv-polaris10-replay.txt b/.gitlab-ci/piglit/radv-polaris10-replay.txt
new file mode 100644
index 00000000000..f2db2275f91
--- /dev/null
+++ b/.gitlab-ci/piglit/radv-polaris10-replay.txt
@@ -0,0 +1,16 @@
+summary:
+       name:  results
+       ----  --------
+       pass:        3
+       fail:        0
+      crash:        0
+       skip:        0
+    timeout:        0
+       warn:        0
+ incomplete:        0
+ dmesg-warn:        0
+ dmesg-fail:        0
+    changes:        0
+      fixes:        0
+regressions:        0
+      total:        3
diff --git a/.gitlab-ci/piglit/radv-raven-replay.txt b/.gitlab-ci/piglit/radv-raven-replay.txt
new file mode 100644
index 00000000000..f2db2275f91
--- /dev/null
+++ b/.gitlab-ci/piglit/radv-raven-replay.txt
@@ -0,0 +1,16 @@
+summary:
+       name:  results
+       ----  --------
+       pass:        3
+       fail:        0
+      crash:        0
+       skip:        0
+    timeout:        0
+       warn:        0
+ incomplete:        0
+ dmesg-warn:        0
+ dmesg-fail:        0
+    changes:        0
+      fixes:        0
+regressions:        0
+      total:        3