From 5e60bee9c09049392b4ae8a447143e99a355cb8d Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Tue, 18 Jun 2024 08:20:43 +0200
Subject: [PATCH] Adjust CI matrix for ansible-core devel's ansible-test (#771)

* Adjust CI matrix for ansible-core devel's ansible-test.

* Don't install cryptography via pip on Ubuntu 24.04.

* Don't force-enable on Fedora.
---
 .azure-pipelines/azure-pipelines.yml          | 32 ++++++++++++-------
 .../prepare_http_tests/tasks/default.yml      |  2 +-
 .../targets/setup_python_info/vars/main.yml   |  4 +++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index b4e864e4..dba76949 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -107,12 +107,12 @@ stages:
         parameters:
           testFormat: devel/linux/{0}
           targets:
-            - name: Fedora 39
-              test: fedora39
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-            - name: Alpine 3.19
-              test: alpine319
+            - name: Fedora 40
+              test: fedora40
+            - name: Ubuntu 24.04
+              test: ubuntu2404
+            - name: Alpine 3.20
+              test: alpine320
           groups:
             - 1
             - 2
@@ -124,6 +124,10 @@ stages:
         parameters:
           testFormat: 2.17/linux/{0}
           targets:
+            - name: Fedora 39
+              test: fedora39
+            - name: Ubuntu 22.04
+              test: ubuntu2204
             - name: Alpine 3.19
               test: alpine319
           groups:
@@ -190,12 +194,14 @@ stages:
         parameters:
           testFormat: devel/{0}
           targets:
-            - name: Alpine 3.19
-              test: alpine/3.19
-            - name: Fedora 39
-              test: fedora/39
+            - name: Alpine 3.20
+              test: alpine/3.20
+            - name: Fedora 40
+              test: fedora/40
             - name: Ubuntu 22.04
               test: ubuntu/22.04
+            - name: Ubuntu 24.04
+              test: ubuntu/24.04
           groups:
             - vm
   - stage: Remote_devel
@@ -208,8 +214,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 14.0
               test: freebsd/14.0
           groups:
@@ -223,6 +229,8 @@ stages:
         parameters:
           testFormat: 2.17/{0}
           targets:
+            - name: RHEL 9.3
+              test: rhel/9.3
             - name: FreeBSD 13.3
               test: freebsd/13.3
           groups:
diff --git a/tests/integration/targets/prepare_http_tests/tasks/default.yml b/tests/integration/targets/prepare_http_tests/tasks/default.yml
index 562fadd2..ad779137 100644
--- a/tests/integration/targets/prepare_http_tests/tasks/default.yml
+++ b/tests/integration/targets/prepare_http_tests/tasks/default.yml
@@ -5,7 +5,7 @@
 
 - name: RedHat - Enable the dynamic CA configuration feature
   command: update-ca-trust force-enable
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family == 'RedHat' and ansible_distribution != "Fedora"
 
 - name: RedHat - Retrieve test cacert
   get_url:
diff --git a/tests/integration/targets/setup_python_info/vars/main.yml b/tests/integration/targets/setup_python_info/vars/main.yml
index 8bbf9f67..9d9c44c8 100644
--- a/tests/integration/targets/setup_python_info/vars/main.yml
+++ b/tests/integration/targets/setup_python_info/vars/main.yml
@@ -35,6 +35,8 @@ system_python_version_data:
       - '3.8'
     '22':
       - '3.10'
+    '24':
+      - '3.12'
   Darwin:
     '10.11':
       - '2.7'
@@ -91,3 +93,5 @@ cannot_upgrade_cryptography:
   Ubuntu:
     '18':
       - '3.9'  # this is the default container for ansible-core 2.12; upgrading cryptography wrecks pyOpenSSL
+    '24':
+      - '3.12'  # ERROR: Cannot uninstall cryptography 41.0.7, RECORD file not found. Hint: The package was installed by debian.