ci/skqp: Remove .baremetal-skqp-test in favor of .skqp-test

Both hidden jobs has the same content, let's reuse it.

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17835>

.gitlab-ci/test/gitlab-ci.yml

@@ -181,11 +181,6 @@
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     FDO_CI_CONCURRENT: 0 # Default to number of CPUs
 
-.baremetal-skqp-test:
-  variables:
-    HWCI_START_XORG: 1
-    HWCI_TEST_SCRIPT: "/install/skqp-runner.sh"
-
 # For Valve's bare-metal testing farm jobs.
 .b2c-test:
   # It would be nice to use ci-templates within Mesa CI for this job's

src/freedreno/ci/gitlab-ci.yml

@@ -203,7 +203,7 @@ a630_gles_asan:
 
 a630_skqp:
   extends:
-    - .baremetal-skqp-test
+    - .skqp-test
     - .a630-test
     - .freedreno-turnip-rules
   variables: