From 1bca7ca3e0b857c9e3d69e41b2072513c149b341 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Wed, 8 Oct 2025 08:28:53 +0200
Subject: [PATCH] ci: Rename ANDROID_GPU_MODE to CUTTLEFISH_GPU_MODE

Makes the variable name more clear.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37738>
---
 .gitlab-ci/cuttlefish-runner.sh                 | 4 ++--
 src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml   | 2 +-
 src/gallium/drivers/virgl/ci/gitlab-ci.yml      | 2 +-
 src/gallium/frontends/lavapipe/ci/gitlab-ci.yml | 4 ++--
 src/virtio/ci/gitlab-ci-inc.yml                 | 2 +-
 src/virtio/ci/gitlab-ci.yml                     | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index 05617f1d166..1696f24bd7c 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -60,7 +60,7 @@ VSOCK_CID=$((VSOCK_BASE + (CI_JOB_ID & 0xfff)))
 
 # Venus requires a custom kernel for now
 CUSTOM_KERNEL_ARGS=""
-if [ "$ANDROID_GPU_MODE" = "venus" ] || [ "$ANDROID_GPU_MODE" = "venus_guest_angle" ]; then
+if [ "$CUTTLEFISH_GPU_MODE" = "venus" ] || [ "$CUTTLEFISH_GPU_MODE" = "venus_guest_angle" ]; then
   CUSTOM_KERNEL_ARGS="
   -kernel_path=/cuttlefish/bzImage
   -initramfs_path=/cuttlefish/initramfs.img
@@ -79,7 +79,7 @@ HOME=/cuttlefish launch_cvd \
   -enable_modem_simulator=false \
   -guest_enforce_security=false \
   -report_anonymous_usage_stats=no \
-  -gpu_mode="$ANDROID_GPU_MODE" \
+  -gpu_mode="$CUTTLEFISH_GPU_MODE" \
   -cpus=${FDO_CI_CONCURRENT:-4} \
   -memory_mb ${CUTTLEFISH_MEMORY:-4096} \
   $CUSTOM_KERNEL_ARGS
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 650b1c0b48a..36730140016 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -75,7 +75,7 @@ llvmpipe-deqp-asan:
     - .test-android
     - .llvmpipe-rules
   variables:
-    ANDROID_GPU_MODE: mesa_swrast
+    CUTTLEFISH_GPU_MODE: mesa_swrast
     GPU_VERSION: llvmpipe
     DEQP_SUITE: android-llvmpipe
     # TODO: define DEQP_FRACTION?
diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
index 691d1b6942c..490b7f16c66 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -70,6 +70,6 @@ virgl-traces:
     - .test-android
     - .virgl-rules
   variables:
-    ANDROID_GPU_MODE: drm_virgl
+    CUTTLEFISH_GPU_MODE: drm_virgl
     GPU_VERSION: virgl-gl
     DEQP_SUITE: android-virgl
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
index 2809f3295e5..3a6cb376068 100644
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -61,7 +61,7 @@ lavapipe-vkd3d:
 
 android-angle-lavapipe:
   variables:
-    ANDROID_GPU_MODE: mesa_swrast_guest_angle
+    CUTTLEFISH_GPU_MODE: mesa_swrast_guest_angle
     DEQP_SUITE: android-angle-lavapipe
     GPU_VERSION: lvp-android-angle
   timeout: 15m
@@ -72,7 +72,7 @@ android-angle-lavapipe:
 
 android-angle-lavapipe-cts:
   variables:
-    ANDROID_GPU_MODE: mesa_swrast_guest_angle
+    CUTTLEFISH_GPU_MODE: mesa_swrast_guest_angle
     GPU_VERSION: lvp-android-angle
   timeout: 15m
   extends:
diff --git a/src/virtio/ci/gitlab-ci-inc.yml b/src/virtio/ci/gitlab-ci-inc.yml
index 0d0c96bb652..b75440b34a9 100644
--- a/src/virtio/ci/gitlab-ci-inc.yml
+++ b/src/virtio/ci/gitlab-ci-inc.yml
@@ -60,5 +60,5 @@
     - .anv-test
     - .test-angle
   variables:
-    ANDROID_GPU_MODE: venus_guest_angle
+    CUTTLEFISH_GPU_MODE: venus_guest_angle
     VK_DRIVER: intel
diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml
index 47adb12d86f..1f69b6c9ed0 100644
--- a/src/virtio/ci/gitlab-ci.yml
+++ b/src/virtio/ci/gitlab-ci.yml
@@ -31,7 +31,7 @@ venus-lavapipe-full:
     - .test-android
     - .venus-lavapipe-manual-rules
   variables:
-    ANDROID_GPU_MODE: venus
+    CUTTLEFISH_GPU_MODE: venus
     GPU_VERSION: venus
     DEQP_SUITE: android-venus
     # TODO: define DEQP_FRACTION?
@@ -42,7 +42,7 @@ venus-lavapipe-full:
     - .venus-lavapipe-manual-rules
     - .test-angle
   variables:
-    ANDROID_GPU_MODE: venus_guest_angle
+    CUTTLEFISH_GPU_MODE: venus_guest_angle
     GPU_VERSION: venus
     DEQP_SUITE: android-venus-angle
     # TODO: define DEQP_FRACTION?