From 4abcf8433c89542c75a52c4f6adf839031b97551 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Fri, 20 Aug 2021 14:01:39 -0700
Subject: [PATCH] ci/iris: Consistently use .test-manual-mr for our unstable
 hardware.

... and place it in the board's definition, instead of the consuming jobs.

GLK and APL are the boards that are enabled by default so far, and the
rest are off.  But, if you want to check on some other board, you should
be able to click the button.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12437>
---
 src/gallium/drivers/iris/ci/gitlab-ci.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml
index fca2beb7a0d..0505e9bc58b 100644
--- a/src/gallium/drivers/iris/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml
@@ -34,6 +34,7 @@
 .iris-amly-test:
   extends:
     - .iris-test
+    - .test-manual-mr
   variables:
     DEVICE_TYPE: asus-C433TA-AJ0005-rammus
     GPU_VERSION: iris-amly
@@ -44,6 +45,7 @@
 .iris-kbl-test:
   extends:
     - .iris-test
+    - .test-manual-mr
   variables:
     DEVICE_TYPE: hp-x360-14-G1-sona
     GPU_VERSION: iris-kbl
@@ -54,6 +56,7 @@
 .iris-whl-test:
   extends:
     - .iris-test
+    - .test-manual-mr
   variables:
     DEVICE_TYPE: dell-latitude-5400-4305U-sarien
     GPU_VERSION: iris-whl
@@ -64,6 +67,7 @@
 .iris-cml-test:
   extends:
     - .iris-test
+    - .test-manual-mr
   variables:
     DEVICE_TYPE: asus-C436FA-Flip-hatch
     GPU_VERSION: iris-cml
@@ -148,13 +152,13 @@ iris-glk-egl:
     HWCI_START_XORG: 1
     DEQP_VER: egl
 
-.iris-amly-gles2:
+iris-amly-gles2:
   extends:
     - .iris-amly-test
   variables:
     DEQP_VER: gles2
 
-.iris-amly-gles3:
+iris-amly-gles3:
   extends:
     - .iris-amly-test
     - .test-manual-mr
@@ -163,7 +167,7 @@ iris-glk-egl:
     DEQP_EXPECTED_RENDERER: AML
     DEQP_FRACTION: 2
 
-.iris-amly-gles31:
+iris-amly-gles31:
   extends:
     - .iris-amly-test
     - .test-manual-mr
@@ -172,13 +176,13 @@ iris-glk-egl:
     DEQP_EXPECTED_RENDERER: AML
     DEQP_FRACTION: 2
 
-.iris-amly-gl:
+iris-amly-gl:
   extends:
     - .iris-amly-test
   variables:
     DEQP_VER: gl46
 
-.iris-amly-egl:
+iris-amly-egl:
   extends:
     - .iris-amly-test
   variables:
@@ -186,7 +190,7 @@ iris-glk-egl:
     HWCI_START_XORG: 1
     DEQP_VER: egl
 
-.iris-amly-piglit:
+iris-amly-piglit:
   extends:
     - .iris-amly-test
     - .lava-piglit
@@ -224,7 +228,7 @@ iris-glk-traces:
     - .iris-glk-test
     - .iris-traces
 
-.iris-amly-traces:
+iris-amly-traces:
   variables:
     GPU_VERSION: intel-amly
   extends:
@@ -237,7 +241,6 @@ iris-kbl-traces:
   extends:
     - .iris-kbl-test
     - .iris-traces
-    - .test-manual-mr
 
 iris-whl-traces:
   variables:
@@ -245,7 +248,6 @@ iris-whl-traces:
   extends:
     - .iris-whl-test
     - .iris-traces
-    - .test-manual-mr
 
 iris-cml-traces:
   variables:
@@ -253,7 +255,6 @@ iris-cml-traces:
   extends:
     - .iris-cml-test
     - .iris-traces
-    - .test-manual-mr
 
 .profile-traces:
   extends: