From 4f1e6b4a6dd7e8138273661d626a0bc7be0facb2 Mon Sep 17 00:00:00 2001
From: Hideki Saito <saito@fgrep.org>
Date: Tue, 27 Jun 2023 16:04:09 +0900
Subject: [PATCH] Drop Python3.9 and update versions of RHEL,Fedora and FreeBSD
 for ansible-core:devel

* Addresses issue #476
* Drop Python3.9
* Replace Fedora 37 with 38
* Replace FreeBSD13.1 with 13.2
* Replace RHEL 8.7 with 8.8
* Replace RHEL 9.1 with 9.2

Signed-off-by: Hideki Saito <saito@fgrep.org>
---
 .azure-pipelines/azure-pipelines.yml   | 16 ++++++++--------
 changelogs/fragments/477_ci_update.yml |  3 +++
 tests/utils/shippable/shippable.sh     |  4 +---
 3 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 changelogs/fragments/477_ci_update.yml

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 85fb8e5..9fe3cb4 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -53,8 +53,8 @@ stages:
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 37
-              test: fedora37
+            - name: Fedora 38
+              test: fedora38
             - name: openSUSE 15 py3
               test: opensuse15
             - name: Ubuntu 20.04
@@ -213,14 +213,14 @@ stages:
               test: macos/13.2
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.7
-              test: rhel/8.7
-            - name: RHEL 9.1
-              test: rhel/9.1
+            - name: RHEL 8.8
+              test: rhel/8.8
+            - name: RHEL 9.2
+              test: rhel/9.2
             - name: FreeBSD 12.4
               test: freebsd/12.4
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
+            - name: FreeBSD 13.2
+              test: freebsd/13.2
   - stage: Remote_2_15
     displayName: Remote 2.15
     dependsOn: []
diff --git a/changelogs/fragments/477_ci_update.yml b/changelogs/fragments/477_ci_update.yml
new file mode 100644
index 0000000..9429030
--- /dev/null
+++ b/changelogs/fragments/477_ci_update.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - "Drop Python3.9 and update versions of RHEL,Fedora and FreeBSD for ansible-core:devel test(https://github.com/ansible-collections/ansible.posix/issues/476)."
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 1a8be27..1cff6d8 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -145,9 +145,7 @@ function cleanup
         fi
 
         if [ "${process_coverage}" ]; then
-            # use python 3.9 for coverage to avoid running out of memory during coverage xml processing
-            # only use it for coverage to avoid the additional overhead of setting up a virtual environment for a potential no-op job
-            virtualenv --python /usr/bin/python3.9 ~/ansible-venv
+            python3 -m venv ~/ansible-venv
             set +ux
             . ~/ansible-venv/bin/activate
             set -ux