[Android] CI: use the v4 (unversioned) Docker image by default

[Steve Lhomme]

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

CI: use the v4 (unversioned) Docker image by default

The 3.0 should fall into legacy for maintenance at some point.

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

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

diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 4d375dd36e..086261dcf9 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -15,6 +15,8 @@ variables:
 
 default:
   interruptible: true
+  image:
+    name: $VLC_ANDROID_IMAGE_40
   tags:
     - amd64
     - docker
@@ -74,8 +76,6 @@ continuous-app-build:
 
 continuous-app-build-v4:
   extends: .build-all-base
-  image:
-        name: $VLC_ANDROID_IMAGE_40
   script:
     - ./buildsystem/compile.sh --init
     - ./gradlew assembleDebug -PforceVlc4=true
@@ -145,32 +145,24 @@ build-ml-x86_64:
 
 build-ml-arm64-v4:
     extends: .build-ml-base
-    image:
-        name: $VLC_ANDROID_IMAGE_40
     variables:
         ARCH: arm64
         EXTRA_BUILD_PARAM: -vlc4
 
 build-ml-armv7-v4:
     extends: .build-ml-base
-    image:
-        name: $VLC_ANDROID_IMAGE_40
     variables:
         ARCH: arm
         EXTRA_BUILD_PARAM: -vlc4
 
 build-ml-x86-v4:
     extends: .build-ml-base
-    image:
-        name: $VLC_ANDROID_IMAGE_40
     variables:
         ARCH: x86
         EXTRA_BUILD_PARAM: -vlc4
 
 build-ml-x86_64-v4:
     extends: .build-ml-base
-    image:
-        name: $VLC_ANDROID_IMAGE_40
     variables:
         ARCH: x86_64
         EXTRA_BUILD_PARAM: -vlc4
@@ -231,8 +223,6 @@ 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:
-        name: $VLC_ANDROID_IMAGE_40
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
     variables:
@@ -245,8 +235,6 @@ nightly-arm64-v4:
 
 nightly-armv7-v4:
     extends: .build-all-base
-    image:
-        name: $VLC_ANDROID_IMAGE_40
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
     variables:
@@ -259,8 +247,6 @@ nightly-armv7-v4:
 
 nightly-x86-v4:
     extends: .build-all-base
-    image:
-        name: $VLC_ANDROID_IMAGE_40
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
     variables:
@@ -273,8 +259,6 @@ nightly-x86-v4:
 
 nightly-x86_64-v4:
     extends: .build-all-base
-    image:
-        name: $VLC_ANDROID_IMAGE_40
     rules:
         - if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
     variables:
@@ -306,8 +290,6 @@ nightly-x86_64-v4:
       M2_REPO: "$CI_PROJECT_DIR/aars/repository"
 
 .build-libs-base-v4:
-    image:
-        name: $VLC_ANDROID_IMAGE_40
     rules:
       - if: '$CI_COMMIT_TAG =~ /^libvlc-4.*$/'
     stage: build