Move ansible-core 2.13 to EOL CI.

ansible-collections · Sep 19, 2023 · 8eb4751 · 8eb4751
1 parent 5c7f9fe
commit 8eb4751
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 49 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -61,17 +61,6 @@ stages:
               test: '2.14/sanity/extra'
             - name: Units
               test: '2.14/units/1'
-  - stage: Ansible_2_13
-    displayName: Sanity & Units 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          targets:
-            - name: Sanity
-              test: '2.13/sanity/1'
-            - name: Units
-              test: '2.13/units/1'
 
 ### Docker
   - stage: Docker_2_14
@@ -97,25 +86,6 @@ stages:
           groups:
             - 4
             - 5
-  - stage: Docker_2_13
-    displayName: Docker 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.13/linux/{0}
-          targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 35
-              test: fedora35
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: Alpine 3
-              test: alpine3
-          groups:
-            - 4
-            - 5
 
 ### Community Docker
   - stage: Docker_community_2_14
@@ -154,34 +124,15 @@ stages:
             - 3
             - 4
             - 5
-  - stage: Remote_2_13
-    displayName: Remote 2.13
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: RHEL {0}
-          testFormat: 2.13/rhel/{0}
-          targets:
-            - test: '8.5'
-          groups:
-            - 1
-            - 2
-            - 3
-            - 4
-            - 5
 
   ## Finally
 
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
       - Ansible_2_14
-      - Ansible_2_13
       - Remote_2_14
-      - Remote_2_13
       - Docker_2_14
-      - Docker_2_13
       - Docker_community_2_14
     jobs:
       - template: templates/coverage.yml
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -26,6 +26,7 @@ jobs:
           - '2.10'
           - '2.11'
           - '2.12'
+          - '2.13'
     # 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
@@ -65,6 +66,7 @@ jobs:
           - '2.10'
           - '2.11'
           - '2.12'
+          - '2.13'
 
     steps:
       - name: >-
@@ -171,6 +173,39 @@ jobs:
             docker: ubuntu1804
             python: ''
             target: shippable/posix/group5/
+          # 2.13
+          - ansible: '2.13'
+            docker: centos7
+            python: ''
+            target: shippable/posix/group4/
+          - ansible: '2.13'
+            docker: centos7
+            python: ''
+            target: shippable/posix/group5/
+          - ansible: '2.13'
+            docker: fedora35
+            python: ''
+            target: shippable/posix/group4/
+          - ansible: '2.13'
+            docker: fedora35
+            python: ''
+            target: shippable/posix/group5/
+          - ansible: '2.13'
+            docker: opensuse15py2
+            python: ''
+            target: shippable/posix/group4/
+          - ansible: '2.13'
+            docker: opensuse15py2
+            python: ''
+            target: shippable/posix/group5/
+          - ansible: '2.13'
+            docker: alpine3
+            python: ''
+            target: shippable/posix/group4/
+          - ansible: '2.13'
+            docker: alpine3
+            python: ''
+            target: shippable/posix/group5/
 
     steps:
       - name: >-