Mesa (master): ci/freedreno: Merge a630 piglit to a single job.

[GitLab Mirror]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Apr 14 12:32:58 2021 -0700

ci/freedreno: Merge a630 piglit to a single job.

piglit_gl clocked in at 6:12 end-to-end runtime, and piglit_shader spent
2:53 in deqp-runner, so merging them together should be about 9 minutes.
Removing a boot should save us a minute or two of runner time per
pipeline.

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

---

 src/freedreno/ci/gitlab-ci.yml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 92f05490b86..7fb9df159fa 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -248,25 +248,14 @@ a630_vk_sysmem:
     GPU_VERSION: freedreno-a630-bypass
     TU_DEBUG: sysmem
 
-.a630_piglit:
+a630_piglit:
   extends:
     - .piglit-test
     - .a630-test
   variables:
     BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
     BM_START_XORG: 1
-
-a630_piglit_gl:
-  extends:
-    - .a630_piglit
-  variables:
-    PIGLIT_PROFILES: quick_gl
-
-a630_piglit_shader:
-  extends:
-    - .a630_piglit
-  variables:
-    PIGLIT_PROFILES: quick_shader
+    PIGLIT_PROFILES: gpu
 
 a630-traces:
   extends: