From 9edb47ce32445df9f8aa7bbc9067edd7487f7ed4 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 29 May 2023 17:55:04 +0200
Subject: [PATCH] Move ansible-core 2.12 to EOL CI (#640) (#641)

* https://github.com/ansible/ansible/pull/79734 has been merged and backported for all branches but stable-2.10 and stable-2.11.

* Move ansible-core 2.12 to EOL CI.

(cherry picked from commit cad2ecca3d55870cee0b05d6e517ac84e5a52c21)
---
 .azure-pipelines/azure-pipelines.yml | 47 ----------------------------
 .github/workflows/ansible-test.yml   | 33 +++++++++++++++++--
 2 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index e2326dfd..d18410dd 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -72,17 +72,6 @@ stages:
               test: '2.13/sanity/1'
             - name: Units
               test: '2.13/units/1'
-  - stage: Ansible_2_12
-    displayName: Sanity & Units 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: '2.12/sanity/1'
-            - name: Units
-              test: '2.12/units/1'
 
 ### Docker
   - stage: Docker_2_14
@@ -127,23 +116,6 @@ stages:
           groups:
             - 4
             - 5
-  - stage: Docker_2_12
-    displayName: Docker 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/linux/{0}
-          targets:
-            - name: CentOS 8
-              test: centos8
-            - name: Fedora 34
-              test: fedora34
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-          groups:
-            - 4
-            - 5
 
 ### Community Docker
   - stage: Docker_community_2_14
@@ -198,22 +170,6 @@ stages:
             - 3
             - 4
             - 5
-  - stage: Remote_2_12
-    displayName: Remote 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: RHEL {0}
-          testFormat: 2.12/rhel/{0}
-          targets:
-            - test: '8.4'
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
 
   ## Finally
 
@@ -222,13 +178,10 @@ stages:
     dependsOn:
       - Ansible_2_14
       - Ansible_2_13
-      - Ansible_2_12
       - Remote_2_14
       - Remote_2_13
-      - Remote_2_12
       - Docker_2_14
       - Docker_2_13
-      - Docker_2_12
       - Docker_community_2_14
     jobs:
       - template: templates/coverage.yml
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index a97ec81d..16cfbc48 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -25,6 +25,7 @@ jobs:
           - '2.9'
           - '2.10'
           - '2.11'
+          - '2.12'
     # Ansible-test on various stable branches does not yet work well with cgroups v2.
     # Since ubuntu-latest now uses Ubuntu 22.04, we need to fall back to the ubuntu-20.04
     # image for these stable branches. The list of branches where this is necessary will
@@ -38,7 +39,7 @@ jobs:
       - name: Perform sanity testing
         uses: felixfontein/ansible-test-gh-action@main
         with:
-          ansible-core-github-repository-slug: felixfontein/ansible
+          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
           ansible-core-version: stable-${{ matrix.ansible }}
           coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
           pull-request-change-detection: 'true'
@@ -63,6 +64,7 @@ jobs:
           - '2.9'
           - '2.10'
           - '2.11'
+          - '2.12'
 
     steps:
       - name: >-
@@ -70,7 +72,7 @@ jobs:
           Ansible version ${{ matrix.ansible }}
         uses: felixfontein/ansible-test-gh-action@main
         with:
-          ansible-core-github-repository-slug: felixfontein/ansible
+          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
           ansible-core-version: stable-${{ matrix.ansible }}
           coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
           pull-request-change-detection: 'true'
@@ -144,6 +146,31 @@ jobs:
             docker: alpine3
             python: ''
             target: shippable/posix/group5/
+          # 2.12
+          - ansible: '2.12'
+            docker: fedora33
+            python: ''
+            target: shippable/posix/group4/
+          - ansible: '2.12'
+            docker: fedora33
+            python: ''
+            target: shippable/posix/group5/
+          - ansible: '2.12'
+            docker: fedora34
+            python: ''
+            target: shippable/posix/group4/
+          - ansible: '2.12'
+            docker: fedora34
+            python: ''
+            target: shippable/posix/group5/
+          - ansible: '2.12'
+            docker: ubuntu1804
+            python: ''
+            target: shippable/posix/group4/
+          - ansible: '2.12'
+            docker: ubuntu1804
+            python: ''
+            target: shippable/posix/group5/
 
     steps:
       - name: >-
@@ -152,7 +179,7 @@ jobs:
           under Python ${{ matrix.python }}
         uses: felixfontein/ansible-test-gh-action@main
         with:
-          ansible-core-github-repository-slug: felixfontein/ansible
+          ansible-core-github-repository-slug: ${{ contains(fromJson('["2.10", "2.11"]'), matrix.ansible) && 'felixfontein/ansible' || 'ansible/ansible' }}
           ansible-core-version: stable-${{ matrix.ansible }}
           coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }}
           docker-image: ${{ matrix.docker }}