GitHub actions: upgrade Android images to Jammy

Change-Id: I87101508891fb49237e8a05c6d272b8fc27117d6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 38 insertions, 38 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c5fc827d1..0fe723045 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -380,42 +380,42 @@ jobs:
           }
         - {
             name: 'Run Android tests (Qt 5.15)',
-            image: 'focal-android-515',
+            image: 'jammy-android-515',
             suffix: 'linux',
             profile: '',
             script: './scripts/test-qt-for-android.sh',
           }
         - {
-            name: 'Run Android tests (Qt 6.2.0)',
-            image: 'focal-android-620',
+            name: 'Run Android tests (Qt 6.2)',
+            image: 'jammy-android-62',
             suffix: 'linux',
             profile: '',
             script: './scripts/test-qt-for-android.sh',
           }
         - {
-              name: 'Run Android tests (Qt 6.5.0)',
-              image: 'focal-android-650',
+              name: 'Run Android tests (Qt 6.5)',
+              image: 'jammy-android-65',
               suffix: 'linux',
               profile: '',
               script: './scripts/test-qt-for-android.sh',
             }
         - {
             name: 'Run Android tests (ndk r19c)',
-            image: 'focal-android-ndk-r19c',
+            image: 'jammy-android-ndk-r19c',
             suffix: 'linux',
             profile: '',
             script: './scripts/test-for-android.sh',
           }
         - {
             name: 'Run Android tests (ndk r21e)',
-            image: 'focal-android-ndk-r21e',
+            image: 'jammy-android-ndk-r21e',
             suffix: 'linux',
             profile: '',
             script: './scripts/test-for-android.sh',
           }
         - {
             name: 'Run Android tests (ndk r23)',
-            image: 'focal-android-ndk-r23',
+            image: 'jammy-android-ndk-r23',
             suffix: 'linux',
             profile: '',
             script: './scripts/test-for-android.sh',
diff --git a/docker-compose.yml b/docker-compose.yml
index 835cfda9f..faaf764f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -65,65 +65,65 @@ services:
         QT_VERSION: 6.5.0
         QTCREATOR_VERSION: 9.0.2
 
-  focal-android-515:
+  jammy-android-515:
     << : *linux
-    hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.15.1-4
+    hostname: jammy-android
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-5.15.2-0
     build:
-      dockerfile: docker/focal/test-android.Dockerfile
+      dockerfile: docker/jammy/test-android.Dockerfile
       context: .
       args:
-        QT_VERSION: 5.15.1
+        QT_VERSION: 5.15.2
         ANDROID_NDK_VERSION: 23.0.7599858
 
-  focal-android-620:
+  jammy-android-62:
     << : *linux
-    hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.2.0-4
+    hostname: jammy-android
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-6.2.4-0
     build:
-      dockerfile: docker/focal/test-android.Dockerfile
+      dockerfile: docker/jammy/test-android.Dockerfile
       context: .
       args:
-        QT_VERSION: 6.2.0
+        QT_VERSION: 6.2.4
         ANDROID_NDK_VERSION: 23.0.7599858
 
-  focal-android-650:
+  jammy-android-65:
     << : *linux
-    hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.5.0-0
+    hostname: jammy-android
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-6.5.0-0
     build:
-      dockerfile: docker/focal/test-android.Dockerfile
+      dockerfile: docker/jammy/test-android.Dockerfile
       context: .
       args:
         QT_VERSION: 6.5.0
         ANDROID_NDK_VERSION: 25.1.8937393
 
-  focal-android-ndk-r19c:
+  jammy-android-ndk-r19c:
     << : *linux
-    hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-ndk-r19c-0
+    hostname: jammy-android
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-ndk-r19c-0
     build:
-      dockerfile: docker/focal/test-android-no-qt.Dockerfile
+      dockerfile: docker/jammy/test-android-no-qt.Dockerfile
       context: .
       args:
        ANDROID_NDK_VERSION: 19.2.5345600
 
-  focal-android-ndk-r21e:
+  jammy-android-ndk-r21e:
     << : *linux
-    hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-ndk-r21e-0
+    hostname: jammy-android
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-ndk-r21e-0
     build:
-      dockerfile: docker/focal/test-android-no-qt.Dockerfile
+      dockerfile: docker/jammy/test-android-no-qt.Dockerfile
       context: .
       args:
         ANDROID_NDK_VERSION: 21.4.7075529
 
-  focal-android-ndk-r23:
+  jammy-android-ndk-r23:
     << : *linux
-    hostname: focal-android
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-ndk-r23-0
+    hostname: jammy-android
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-ndk-r23-0
     build:
-      dockerfile: docker/focal/test-android-no-qt.Dockerfile
+      dockerfile: docker/jammy/test-android-no-qt.Dockerfile
       context: .
       args:
         ANDROID_NDK_VERSION: 23.0.7599858
diff --git a/docker/focal/test-android-no-qt.Dockerfile b/docker/jammy/test-android-no-qt.Dockerfile
index e1622043a..4e6dadf4f 100644
--- a/docker/focal/test-android-no-qt.Dockerfile
+++ b/docker/jammy/test-android-no-qt.Dockerfile
@@ -1,7 +1,7 @@
 #
 # Android SDK/NDK for testing Qbs
 #
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu test environment for Qbs for Android"
 
 # Allow colored output on command line.
@@ -27,7 +27,7 @@ RUN apt-get update -qq && \
     usermod -a -G sudo ${USER_NAME} && \
     echo "%devel         ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
 
-COPY docker/focal/entrypoint.sh /sbin/entrypoint.sh
+COPY docker/entrypoint.sh /sbin/entrypoint.sh
 ENTRYPOINT ["/sbin/entrypoint.sh"]
 
 # Qbs build dependencies
diff --git a/docker/focal/test-android.Dockerfile b/docker/jammy/test-android.Dockerfile
index 5f479e4fc..b17cee65b 100644
--- a/docker/focal/test-android.Dockerfile
+++ b/docker/jammy/test-android.Dockerfile
@@ -1,7 +1,7 @@
 #
 # Android SDK/NDK + Qt for Android for testing Qbs
 #
-FROM ubuntu:focal
+FROM ubuntu:jammy
 LABEL Description="Ubuntu test environment for Qbs and Qt for Android"
 
 # Allow colored output on command line.
@@ -27,7 +27,7 @@ RUN apt-get update -qq && \
     usermod -a -G sudo ${USER_NAME} && \
     echo "%devel         ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
 
-COPY docker/focal/entrypoint.sh /sbin/entrypoint.sh
+COPY docker/entrypoint.sh /sbin/entrypoint.sh
 ENTRYPOINT ["/sbin/entrypoint.sh"]
 
 # Qbs build dependencies