From 5e4b1da813ba88a510265da8a7f19ede08164aa0 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 4 Oct 2023 07:48:02 +0200
Subject: [PATCH 1/2] ansible-core devel drops support for Python 2.7 and 3.6.

---
 .azure-pipelines/azure-pipelines.yml           | 18 ++++++------------
 .github/workflows/ansible-test.yml             |  2 +-
 .../setup_docker_compose/vars/Alpine.yml       | 10 ++++++++++
 3 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 tests/integration/targets/setup_docker_compose/vars/Alpine.yml

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 885b23ea9..09501b7cc 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -109,12 +109,8 @@ stages:
         parameters:
           testFormat: devel/linux/{0}
           targets:
-            - name: CentOS 7
-              test: centos7
-            #- name: Fedora 38
-            #  test: fedora38
-            - name: openSUSE 15
-              test: opensuse15
+            - name: Fedora 38
+              test: fedora38
             - name: Ubuntu 20.04
               test: ubuntu2004
             - name: Ubuntu 22.04
@@ -132,8 +128,10 @@ stages:
         parameters:
           testFormat: 2.16/linux/{0}
           targets:
-            - name: Fedora 38
-              test: fedora38
+            - name: CentOS 7
+              test: centos7
+            - name: openSUSE 15
+              test: opensuse15
           groups:
             - 4
             - 5
@@ -181,10 +179,6 @@ stages:
               test: debian-bookworm/3.11
             - name: ArchLinux
               test: archlinux/3.11
-            - name: CentOS Stream 8 with Python 3.6
-              test: centos-stream8/3.6
-            - name: CentOS Stream 8 with Python 3.9
-              test: centos-stream8/3.9
           groups:
             - 4
             - 5
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index 046bda929..366ccdac4 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -155,7 +155,7 @@ jobs:
             docker: ubuntu1804
             python: ''
             target: azp/5/
-          # 2.12
+          # 2.13
           - ansible: '2.13'
             docker: fedora35
             python: ''
diff --git a/tests/integration/targets/setup_docker_compose/vars/Alpine.yml b/tests/integration/targets/setup_docker_compose/vars/Alpine.yml
new file mode 100644
index 000000000..9c0a9499f
--- /dev/null
+++ b/tests/integration/targets/setup_docker_compose/vars/Alpine.yml
@@ -0,0 +1,10 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+docker_compose_packages:
+  - docker-compose
+  - py3-yaml
+docker_compose_pip_packages:
+  - docker-compose

From 0ae695060f35590e52844026702a359b3922accf Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 4 Oct 2023 23:01:34 +0200
Subject: [PATCH 2/2] Force PyYAML 5.3.1 on Alpine.

---
 tests/integration/targets/setup_docker_compose/vars/Alpine.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration/targets/setup_docker_compose/vars/Alpine.yml b/tests/integration/targets/setup_docker_compose/vars/Alpine.yml
index 9c0a9499f..fb03ae738 100644
--- a/tests/integration/targets/setup_docker_compose/vars/Alpine.yml
+++ b/tests/integration/targets/setup_docker_compose/vars/Alpine.yml
@@ -5,6 +5,7 @@
 
 docker_compose_packages:
   - docker-compose
-  - py3-yaml
 docker_compose_pip_packages:
   - docker-compose
+  # Force PyYAML to 5.3.1
+  - PyYAML==5.3.1