From 7f4df969c93eba0866a0098c0eb0495b65b69df0 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Wed, 20 Jul 2022 12:23:59 -0700
Subject: [PATCH] Revert "ci/freedreno: Switch a630 to manual/disabled for lab
 maintenance."

This reverts commit 7e381ba9fcc4b2cba0ab72fdfbe5535561e23f6c.  2 new
boards are in place, bringing us from 7 to 9.  We hoped for 12, but have
ongoing power stability issues.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17662>
---
 src/freedreno/ci/gitlab-ci.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index b216993..757a46e 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -160,7 +160,6 @@ a618_vk_full:
 .a630-test:
   extends:
     - .freedreno-test
-    - .test-manual-mr
   variables:
     FDO_CI_CONCURRENT: 10
     BM_KERNEL: /baremetal-files/cheza-kernel
@@ -207,7 +206,6 @@ a630_skqp:
     - .baremetal-skqp-test
     - .a630-test
     - .freedreno-turnip-rules
-    - .test-manual-mr
   variables:
     # Possible skqp backends: gl, gles, unitTest and vk
     SKQP_BACKENDS: gl gles vk unitTest  # space separated values
@@ -218,7 +216,6 @@ a630_vk:
     - .a630-test
     - .baremetal-deqp-test-freedreno-vk
     - .turnip-rules
-    - .test-manual-mr
   variables:
     DEQP_SUITE: freedreno-a630-vk
 
@@ -241,7 +238,6 @@ a630_vk_asan:
     - .baremetal-deqp-test-freedreno-vk
     - .baremetal-arm64-asan-test
     - .turnip-rules
-    - .test-manual-mr
   variables:
     DEQP_SUITE: freedreno-a630-vk-asan
     FDO_CI_CONCURRENT: 2 # We get OOMkills if we go too wide with asan enabled
@@ -253,7 +249,6 @@ a630_piglit:
     - .a630-test
     # Note that piglit has GL+VK integration testing.
     - .freedreno-turnip-rules
-    - .test-manual-mr
   variables:
     HWCI_START_XORG: 1
     PIGLIT_PROFILES: gpu
@@ -270,7 +265,7 @@ a630-traces:
     MESA_GLSL_VERSION_OVERRIDE: "460"
     MESA_GL_VERSION_OVERRIDE: "4.6"
 
-.a630-traces-restricted:
+a630-traces-restricted:
   extends:
     - a630-traces
     - .freedreno-rules-restricted
@@ -279,7 +274,7 @@ a630-traces:
     PIGLIT_REPLAY_EXTRA_ARGS:  --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-private --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt-file=${CI_JOB_JWT_FILE}
   allow_failure: true
 
-.a630-traces-performance:
+a630-traces-performance:
   extends:
     - a630-traces
     - .freedreno-rules-performance
-- 
2.7.4