ci/nouveau: move disabled jobs back from include into main gitlab-ci.yml

Fixes: 9442571664 ("ci: separate hiden jobs to -inc.yml files")

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26758>

src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml

@@ -82,20 +82,3 @@
   tags:
     - google-nouveau-jetson-nano
 
-# Single Jetson Nano board at anholt's house.
-.gm20b-gles-full:
-  extends:
-    - .gm20b-test
-    - .nouveau-manual-rules
-  timeout: 2h
-  variables:
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    DEQP_SUITE: nouveau-gm20b
-    TEST_PHASE_TIMEOUT: 120
-
-.gm20b-gles:
-  extends:
-    - .gm20b-gles-full
-  timeout: 30m
-  variables:
-    DEQP_FRACTION: 10

src/gallium/drivers/nouveau/ci/gitlab-ci.yml

@@ -12,3 +12,21 @@ gk20a-gles:
     DEQP_SUITE: nouveau-gk20a
     FARM : anholt
     DEVICE_TYPE: anholt-jetson
+
+# Single Jetson Nano board at anholt's house.
+.gm20b-gles-full:
+  extends:
+    - .gm20b-test
+    - .nouveau-manual-rules
+  timeout: 2h
+  variables:
+    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
+    DEQP_SUITE: nouveau-gm20b
+    TEST_PHASE_TIMEOUT: 120
+
+.gm20b-gles:
+  extends:
+    - .gm20b-gles-full
+  timeout: 30m
+  variables:
+    DEQP_FRACTION: 10