From 6527ac72d47def58cb20a352dde659ba490bd826 Mon Sep 17 00:00:00 2001
From: Guilherme Gallo <guilherme.gallo@collabora.com>
Date: Tue, 13 May 2025 21:10:59 +0000
Subject: [PATCH] ci/android: export container for DUTs

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35522>
---
 .gitlab-ci/container/fdo_cntr_export.sh | 1 +
 .gitlab-ci/container/gitlab-ci.yml      | 1 +
 .gitlab-ci/image-tags.yml               | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/container/fdo_cntr_export.sh b/.gitlab-ci/container/fdo_cntr_export.sh
index 6a0cbd11311..5699c5baa56 100644
--- a/.gitlab-ci/container/fdo_cntr_export.sh
+++ b/.gitlab-ci/container/fdo_cntr_export.sh
@@ -15,6 +15,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
+# DEBIAN_TEST_ANDROID_TAG
 # DEBIAN_TEST_GL_TAG
 # DEBIAN_TEST_VIDEO_TAG
 # DEBIAN_TEST_VK_TAG
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index bf396761865..9945c3a16f1 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -511,6 +511,7 @@ debian/x86_64_test-android:
     - .android-variables
     - .use-debian/x86_64_test-base
     - .container-builds-android
+    - .export-container
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_TEST_ANDROID_TAG}
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 96079c0f570..d31bffc56a8 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,7 +23,7 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250611-rust"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250616-vkcts-main"
+  DEBIAN_TEST_ANDROID_TAG: "20250618-rootfs"
   DEBIAN_TEST_GL_TAG: "20250616-vkcts-main"
   DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
   DEBIAN_TEST_VK_TAG: "20250619-vkd3d"