Mesa (main): iris/ci: enable intel devices automatically in MR pipelines

[GitLab Mirror]

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

Author: Gustavo Padovan <gustavo.padovan at collabora.com>
Date:   Fri Apr 30 12:02:39 2021 -0300

iris/ci: enable intel devices automatically in MR pipelines

After a period of stabilization it is now time to move them
to be part of the MR pipelines. We will still watch the
behavior and look for any issue that arises.

Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.com>
Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10550>

---

 src/gallium/drivers/iris/ci/gitlab-ci.yml | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml
index 4f6993358d0..62cd49f7591 100644
--- a/src/gallium/drivers/iris/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml
@@ -4,45 +4,30 @@
     - .iris-rules
   variables:
     ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1"
+    DTB: ""
+    DRIVER_NAME: iris
+    BOOT_METHOD: depthcharge
+    KERNEL_IMAGE_TYPE: ""
+  tags:
+    - mesa-ci-aarch64-lava-collabora
 
 iris-apl-traces:amd64:
   extends:
     - .iris-traces:amd64
-    - .test-manual-mr
   variables:
     DEVICE_TYPE: asus-C523NA-A20057-coral
-    DTB: ""
     GPU_VERSION: intel-apl
-    DRIVER_NAME: iris
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-aarch64-lava-collabora
 
 iris-glk-traces:amd64:
   extends:
     - .iris-traces:amd64
-    - .test-manual-mr
   variables:
     DEVICE_TYPE: hp-x360-12b-n4000-octopus
-    DTB: ""
     GPU_VERSION: intel-glk
-    DRIVER_NAME: iris
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-aarch64-lava-collabora
 
 iris-amly-traces:amd64:
   extends:
     - .iris-traces:amd64
-    - .test-manual-mr
   variables:
     DEVICE_TYPE: asus-C433TA-AJ0005-rammus
-    DTB: ""
     GPU_VERSION: intel-amly
-    DRIVER_NAME: iris
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
-  tags:
-    - mesa-ci-aarch64-lava-collabora