From eb0f85dd8c5f4f5bdc2f9ed28208217f0b173ac5 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Mon, 6 Feb 2023 14:29:38 +0000
Subject: [PATCH] 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>
---
 .gitlab-ci/test/gitlab-ci.yml              | 5 +++++
 src/gallium/drivers/virgl/ci/gitlab-ci.yml | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 1cb18592b9b..03c94f52b8a 100644
--- 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 38722cd622f..dd032f03dac 100644
--- 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/