ci/freedreno: move disabled a530 entries back to main gitlab-ci.yml

Fixes: 9442571664 ("ci: separate hiden jobs to -inc.yml files")
Signed-off-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31177>

src/freedreno/ci/gitlab-ci-inc.yml

@@ -324,28 +324,6 @@
   tags:
     - google-freedreno-db820c
 
-# piglit and piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
-# leave it as manual.  The shader_tests are in the main a530_gl suite.
-#
-# Disabled for now because something reliably takes out the board 19-20 minutes in,
-# and then it reboots and tries again until the job timeout.
-.a530_piglit:
-  extends:
-    - .baremetal-deqp-test
-    - .a530-test
-  parallel: 2
-  variables:
-    DEQP_SUITE: freedreno-a530-piglit
-    HWCI_START_WESTON: 1
-
-.a530_piglit_gl:
-  extends:
-    - .a530_piglit
-    - .google-freedreno-manual-rules
-  parallel: null
-  variables:
-    PIGLIT_PROFILES: quick_gl
-
 # 6 devices (2023-07-06)
 .a630-test:
   extends:

src/freedreno/ci/gitlab-ci.yml

@@ -69,6 +69,28 @@ a530-traces:
     PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a530"
     PIGLIT_RESULTS: "freedreno-a530-replay"
 
+# piglit and piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
+# leave it as manual.  The shader_tests are in the main a530_gl suite.
+#
+# Disabled for now because something reliably takes out the board 19-20 minutes in,
+# and then it reboots and tries again until the job timeout.
+.a530_piglit:
+  extends:
+    - .baremetal-deqp-test
+    - .a530-test
+  parallel: 2
+  variables:
+    DEQP_SUITE: freedreno-a530-piglit
+    HWCI_START_WESTON: 1
+
+.a530_piglit_gl:
+  extends:
+    - .a530_piglit
+    - .google-freedreno-manual-rules
+  parallel: null
+  variables:
+    PIGLIT_PROFILES: quick_gl
+
 a618_vk:
   extends:
     - .lava-test-deqp:arm64