ci/android: move common config to common job

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Helen Koike <helen.koike@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21157>

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 1cb1859..03c94f5 100644 (file)
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -65,6 +65,11 @@ rustfmt:
       artifacts: false  # The Android build will be downloaded later
     - job: debian/x86_test-android
       artifacts: false
+  script:
+    - ./install/cuttlefish-runner.sh
+  artifacts:
+    paths:
+      - results/
 
 .vkd3d-proton-test:
   artifacts:

diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index 38722cd..dd032f0 100644 (file)
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -109,8 +109,3 @@ android-virgl-llvmpipe:
   extends:
     - .test-android
     - .virgl-rules
-  script:
-    - ./install/cuttlefish-runner.sh
-  artifacts:
-    paths:
-      - results/