[Android] CI: use variable names for Docker images

[Steve Lhomme]

vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul 10 08:31:02 2023 +0200| [bcc552dfac2b42901f689fdb5bd3a40aa547734b] | committer: Steve Lhomme

CI: use variable names for Docker images

> https://code.videolan.org/videolan/vlc-android/commit/bcc552dfac2b42901f689fdb5bd3a40aa547734b
---

 buildsystem/gitlab/.gitlab-ci.yml | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 9beb6f17bc..47e5b10324 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -9,9 +9,14 @@ cache:
         - gradle/
         - gradlew
 
+variables:
+  VLC_ANDROID_IMAGE_30: registry.videolan.org/vlc-debian-android-3.0:20230621085943
+  VLC_ANDROID_IMAGE_40: registry.videolan.org/vlc-debian-android:20230614051113
+
 default:
   interruptible: true
-  image: registry.videolan.org/vlc-debian-android-3.0:20230621085943
+  image:
+    name: $VLC_ANDROID_IMAGE_30
   tags:
     - amd64
     - docker
@@ -69,7 +74,8 @@ continuous-app-build:
 
 continuous-app-build-v4:
   extends: .build-all-base
-  image: registry.videolan.org/vlc-debian-android:20230614051113
+  image:
+        name: $VLC_ANDROID_IMAGE_40
   script:
     - ./buildsystem/compile.sh --init
     - ./gradlew assembleDebug -PforceVlc4=true
@@ -123,28 +129,32 @@ build-ml-x86_64:
 
 build-ml-arm64-v4:
     extends: .build-ml-base
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     variables:
         ARCH: arm64
         EXTRA_BUILD_PARAM: -vlc4
 
 build-ml-armv7-v4:
     extends: .build-ml-base
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     variables:
         ARCH: arm
         EXTRA_BUILD_PARAM: -vlc4
 
 build-ml-x86-v4:
     extends: .build-ml-base
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     variables:
         ARCH: x86
         EXTRA_BUILD_PARAM: -vlc4
 
 build-ml-x86_64-v4:
     extends: .build-ml-base
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     variables:
         ARCH: x86_64
         EXTRA_BUILD_PARAM: -vlc4
@@ -197,7 +207,8 @@ nightly-x86_64:
 # Weekly builds: build native & app code, and ship the APK as artifact for vlc4
 nightly-arm64-v4:
     extends: .build-all-base
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
     variables:
@@ -210,7 +221,8 @@ nightly-arm64-v4:
 
 nightly-armv7-v4:
     extends: .build-all-base
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
     variables:
@@ -223,7 +235,8 @@ nightly-armv7-v4:
 
 nightly-x86-v4:
     extends: .build-all-base
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
     variables:
@@ -236,7 +249,8 @@ nightly-x86-v4:
 
 nightly-x86_64-v4:
     extends: .build-all-base
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
     variables:
@@ -266,7 +280,8 @@ nightly-x86_64-v4:
       M2_REPO: "$CI_PROJECT_DIR/aars/repository"
 
 .build-libs-base-v4:
-    image: registry.videolan.org/vlc-debian-android:20230614051113
+    image:
+        name: $VLC_ANDROID_IMAGE_40
     rules:
       - if: '$CI_COMMIT_TAG =~ /^libvlc-4.*$/'
     stage: build