[Android] CI: explicitly set the v3 image on vlc v3 targets

[Steve Lhomme]

vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul 10 08:25:24 2023 +0200| [129626b9b8a4300b74ebbd92aef67a1c4a32b388] | committer: Steve Lhomme

CI: explicitly set the v3 image on vlc v3 targets

This CI should not evolve much in the future and should be set in stone.

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

 buildsystem/gitlab/.gitlab-ci.yml | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 47e5b10324..4d375dd36e 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -15,8 +15,6 @@ variables:
 
 default:
   interruptible: true
-  image:
-    name: $VLC_ANDROID_IMAGE_30
   tags:
     - amd64
     - docker
@@ -66,6 +64,8 @@ stages:
 # vlc-android app only: don't rebuild everything but use a published artifact
 continuous-app-build:
     extends: .build-all-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     script:
         - ./buildsystem/compile.sh --init
         - ./gradlew assembleDebug
@@ -89,41 +89,57 @@ continuous-app-build-v4:
 
 build-libvlc-arm64:
     extends: .build-libvlc-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     variables:
         ARCH: arm64
 
 build-libvlc-armv7:
     extends: .build-libvlc-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     variables:
         ARCH: arm
 
 build-libvlc-x86:
     extends: .build-libvlc-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     variables:
         ARCH: x86
 
 build-libvlc-x86_64:
     extends: .build-libvlc-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     variables:
         ARCH: x86_64
 
 build-ml-arm64:
     extends: .build-ml-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     variables:
         ARCH: arm64
 
 build-ml-armv7:
     extends: .build-ml-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     variables:
         ARCH: arm
 
 build-ml-x86:
     extends: .build-ml-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     variables:
         ARCH: x86
 
 build-ml-x86_64:
     extends: .build-ml-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     variables:
         ARCH: x86_64
 
@@ -162,6 +178,8 @@ build-ml-x86_64-v4:
 # Nightly builds: build native & app code, and ship the APK as artifact
 nightly-arm64:
     extends: .build-all-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"'
     variables:
@@ -173,6 +191,8 @@ nightly-arm64:
 
 nightly-armv7:
     extends: .build-all-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"'
     variables:
@@ -184,6 +204,8 @@ nightly-armv7:
 
 nightly-x86:
     extends: .build-all-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"'
     variables:
@@ -195,6 +217,8 @@ nightly-x86:
 
 nightly-x86_64:
     extends: .build-all-base
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 != "true"'
     variables:
@@ -262,6 +286,8 @@ nightly-x86_64-v4:
         expire_in: 2 weeks
 
 .build-libs-base:
+    image:
+        name: $VLC_ANDROID_IMAGE_30
     rules:
       - if: '$CI_COMMIT_TAG =~ /^libvlc-3.*$/'
     stage: build