From 5535e609a20389d005f8737cce76ae54f859f049 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 30 Jul 2025 23:28:28 +0200
Subject: [PATCH] [stable-3] CI: move ansible-core 2.15 to GHA. (#1105)

* CI: move ansible-core 2.15 to GHA.

* CentOS 7 doesn't work in GHA.
---
 .azure-pipelines/azure-pipelines.yml | 48 ----------------------------
 .github/workflows/ansible-test.yml   | 15 +++++++++
 2 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 9367d7fd..aa24912f 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -95,17 +95,6 @@ stages:
               test: '2.16/sanity/1'
             - name: Units
               test: '2.16/units/1'
-  - stage: Ansible_2_15
-    displayName: Sanity & Units 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: '2.15/sanity/1'
-            - name: Units
-              test: '2.15/units/1'
 
 ### Docker
   - stage: Docker_2_19
@@ -184,22 +173,6 @@ stages:
             - 4
             - 5
             - 6
-  - stage: Docker_2_15
-    displayName: Docker 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/linux/{0}
-          targets:
-            - name: Fedora 37
-              test: fedora37
-            - name: CentOS 7
-              test: centos7
-          groups:
-            - 4
-            - 5
-            - 6
 
 ### Community Docker
   - stage: Docker_community_2_19
@@ -286,24 +259,6 @@ stages:
             # Currently always hangs in group 2
             # - name: RHEL 8.8
             #   test: rhel/8.8
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
-  - stage: Remote_2_15
-    displayName: Remote 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/{0}
-          targets:
-            - name: RHEL 9.1
-              test: rhel/9.1
-            - name: RHEL 8.7
-              test: rhel/8.7
             - name: RHEL 7.9
               test: rhel/7.9
           groups:
@@ -322,17 +277,14 @@ stages:
       - Ansible_2_18
       - Ansible_2_17
       - Ansible_2_16
-      - Ansible_2_15
       - Remote_2_19
       - Remote_2_18
       - Remote_2_17
       - Remote_2_16
-      - Remote_2_15
       - Docker_2_19
       - Docker_2_18
       - Docker_2_17
       - Docker_2_16
-      - Docker_2_15
       - Docker_community_2_19
     jobs:
       - template: templates/coverage.yml
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index 38b07717..2888e312 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -33,6 +33,7 @@ jobs:
           - '2.12'
           - '2.13'
           - '2.14'
+          - '2.15'
     runs-on: ubuntu-latest
     steps:
       - name: Perform sanity testing
@@ -59,6 +60,7 @@ jobs:
           - '2.12'
           - '2.13'
           - '2.14'
+          - '2.15'
 
     steps:
       - name: Perform unit testing against Ansible version ${{ matrix.ansible }}
@@ -197,6 +199,19 @@ jobs:
             docker: alpine3
             python: ''
             target: azp/6/
+          # 2.15
+          - ansible: '2.15'
+            docker: fedora37
+            python: ''
+            target: azp/4/
+          - ansible: '2.15'
+            docker: fedora37
+            python: ''
+            target: azp/5/
+          - ansible: '2.15'
+            docker: fedora37
+            python: ''
+            target: azp/6/
 
     steps:
       - name: Perform integration testing against Ansible version ${{ matrix.ansible }} under Python ${{ matrix.python }}