ansible-test - Update tested platforms

ansible · Jun 13, 2024 · 2949726 · 2949726
1 parent 5af5b4b
commit 2949726
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 42 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -79,10 +79,10 @@ stages:
           targets:
             - name: macOS 14.3
               test: macos/14.3
-            - name: RHEL 9.3 py39
-              test: rhel/9.3@3.9
-            - name: RHEL 9.3 py311
-              test: rhel/9.3@3.11
+            - name: RHEL 9.4 py39
+              test: rhel/9.4@3.9
+            - name: RHEL 9.4 py312
+              test: rhel/9.4@3.12
             - name: FreeBSD 13.3
               test: freebsd/13.3
             - name: FreeBSD 14.0
@@ -95,8 +95,8 @@ stages:
           targets:
             - name: macOS 14.3
               test: macos/14.3
-            - name: RHEL 9.3
-              test: rhel/9.3
+            - name: RHEL 9.4
+              test: rhel/9.4
             - name: FreeBSD 13.3
               test: freebsd/13.3
             - name: FreeBSD 14.0
@@ -108,14 +108,16 @@ stages:
       - template: templates/matrix.yml  # context/controller (ansible-test container management)
         parameters:
           targets:
-            - name: Alpine 3.19
-              test: alpine/3.19
-            - name: Fedora 39
-              test: fedora/39
-            - name: RHEL 9.3
-              test: rhel/9.3
+            - name: Alpine 3.20
+              test: alpine/3.20
+            - name: Fedora 40
+              test: fedora/40
+            - name: RHEL 9.4
+              test: rhel/9.4
             - name: Ubuntu 22.04
               test: ubuntu/22.04
+            - name: Ubuntu 24.04
+              test: ubuntu/24.04
           groups:
             - 6
   - stage: Docker
@@ -125,27 +127,29 @@ stages:
         parameters:
           testFormat: linux/{0}
           targets:
-            - name: Alpine 3.19
-              test: alpine319
-            - name: Fedora 39
-              test: fedora39
-            - name: Ubuntu 20.04
-              test: ubuntu2004
+            - name: Alpine 3.20
+              test: alpine320
+            - name: Fedora 40
+              test: fedora40
             - name: Ubuntu 22.04
               test: ubuntu2204
+            - name: Ubuntu 24.04
+              test: ubuntu2404
           groups:
             - 1
             - 2
       - template: templates/matrix.yml
         parameters:
           testFormat: linux/{0}
           targets:
-            - name: Alpine 3.19
-              test: alpine319
-            - name: Fedora 39
-              test: fedora39
+            - name: Alpine 3.20
+              test: alpine320
+            - name: Fedora 40
+              test: fedora40
             - name: Ubuntu 22.04
               test: ubuntu2204
+            - name: Ubuntu 24.04
+              test: ubuntu2404
           groups:
             - 3
             - 4

diff --git a/changelogs/fragments/ansible-test-platform-updates.yml b/changelogs/fragments/ansible-test-platform-updates.yml
@@ -0,0 +1,6 @@
+minor_changes:
+  - ansible-test - Replace Fedora 39 container and remote with Fedora 40.
+  - ansible-test - Replace Alpine 3.19 container and remote with Alpine 3.20.
+  - ansible-test - Replace Ubuntu 20.04 container with Ubuntu 24.04 container.
+  - ansible-test - Add Ubuntu 24.04 remote.
+  - ansible-test - Replace RHEL 9.3 remote with RHEL 9.4.
diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt
@@ -1,7 +1,7 @@
 base image=quay.io/ansible/base-test-container:7.1.0 python=3.12,3.8,3.9,3.10,3.11,3.13
 default image=quay.io/ansible/default-test-container:10.1.0 python=3.12,3.8,3.9,3.10,3.11,3.13 context=collection
 default image=quay.io/ansible/ansible-core-test-container:10.1.0 python=3.12,3.8,3.9,3.10,3.11,3.13 context=ansible-core
-alpine319 image=quay.io/ansible/alpine319-test-container:7.1.0 python=3.11 cgroup=none audit=none
-fedora39 image=quay.io/ansible/fedora39-test-container:7.1.0 python=3.12
-ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:7.1.0 python=3.8
-ubuntu2204 image=quay.io/ansible/ubuntu2204-test-container:7.1.0 python=3.10
+alpine320 image=quay.io/ansible/alpine320-test-container:8.0.0 python=3.12 cgroup=none audit=none
+fedora40 image=quay.io/ansible/fedora40-test-container:8.0.0 python=3.12
+ubuntu2204 image=quay.io/ansible/ubuntu2204-test-container:8.0.0 python=3.10
+ubuntu2404 image=quay.io/ansible/ubuntu2004-test-container:8.0.0 python=3.12
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt
@@ -1,13 +1,14 @@
-alpine/3.19 python=3.11 become=doas_sudo provider=aws arch=x86_64
+alpine/3.20 python=3.12 become=doas_sudo provider=aws arch=x86_64
 alpine become=doas_sudo provider=aws arch=x86_64
-fedora/39 python=3.12 become=sudo provider=aws arch=x86_64
+fedora/40 python=3.12 become=sudo provider=aws arch=x86_64
 fedora become=sudo provider=aws arch=x86_64
 freebsd/13.3 python=3.9,3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
 freebsd/14.0 python=3.9,3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
 freebsd python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64
 macos/14.3 python=3.11 python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64
 macos python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64
-rhel/9.3 python=3.9,3.11 become=sudo provider=aws arch=x86_64
+rhel/9.4 python=3.9,3.12 become=sudo provider=aws arch=x86_64
 rhel become=sudo provider=aws arch=x86_64
 ubuntu/22.04 python=3.10 become=sudo provider=aws arch=x86_64
+ubuntu/24.04 python=3.12 become=sudo provider=aws arch=x86_64
 ubuntu become=sudo provider=aws arch=x86_64
diff --git a/test/lib/ansible_test/_util/target/setup/bootstrap.sh b/test/lib/ansible_test/_util/target/setup/bootstrap.sh
@@ -268,19 +268,12 @@ bootstrap_remote_rhel_9()
     packages="
         gcc
         ${py_pkg_prefix}-devel
+        ${py_pkg_prefix}-pip
         "
 
-    # pip is not included in the Python devel package under Python 3.11
-    if [ "${python_version}" != "3.9" ]; then
-        packages="
-            ${packages}
-            ${py_pkg_prefix}-pip
-        "
-    fi
-
     # Jinja2 is not installed with an OS package since the provided version is too old.
     # Instead, ansible-test will install it using pip.
-    # packaging and resolvelib are missing for Python 3.11 (and possible later) so we just
+    # packaging and resolvelib are missing for controller supported Python versions, so we just
     # skip them and let ansible-test install them from PyPI.
     if [ "${controller}" ]; then
         packages="
@@ -329,10 +322,6 @@ bootstrap_remote_ubuntu()
         # For these ansible-test will use pip to install the requirements instead.
         # Only the platform is checked since Ubuntu shares Python packages across Python versions.
         case "${platform_version}" in
-            "20.04")
-                jinja2_pkg=""  # too old
-                resolvelib_pkg=""  # not available
-                ;;
         esac
 
         packages="