From c1f830f3df8655d5256f369a806ebd8d3c267d81 Mon Sep 17 00:00:00 2001
From: Hideki Saito <saito@fgrep.org>
Date: Mon, 30 May 2022 10:53:44 +0900
Subject: [PATCH] Refactoring AZP CI matrix

* https://github.com/ansible-collections/news-for-maintainers/issues/17

Signed-off-by: Hideki Saito <saito@fgrep.org>
---
 .azure-pipelines/azure-pipelines.yml | 94 +++++++++++-----------------
 1 file changed, 37 insertions(+), 57 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index e8003df..5d9aafc 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -49,20 +49,20 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/linux/{0}/1
+          testFormat: devel/linux/{0}
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 34
-              test: fedora34
             - name: Fedora 35
               test: fedora35
+            - name: Fedora 36
+              test: fedora36
             - name: openSUSE 15 py3
               test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
             - name: Ubuntu 20.04
               test: ubuntu2004
+            - name: Ubuntu 22.04
+              test: ubuntu2204
   - stage: Docker_2_13
     displayName: Docker 2.13
     dependsOn: []
@@ -131,30 +131,6 @@ stages:
               test: ubuntu1804
             - name: Ubuntu 20.04
               test: ubuntu2004
-  - stage: Docker_2_10
-    displayName: Docker 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.10/linux/{0}/1
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 30
-              test: fedora30
-            - name: Fedora 31
-              test: fedora31
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 16.04
-              test: ubuntu1604
-            - name: Ubuntu 18.04
-              test: ubuntu1804
   - stage: Docker_2_9
     displayName: Docker 2.9
     dependsOn: []
@@ -187,25 +163,31 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: devel/{0}/1
+          testFormat: devel/{0}
           targets:
             - name: MacOS 12.0
               test: macos/12.0
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.5
-              test: rhel/8.5
+            - name: RHEL 8.6
+              test: rhel/8.6
+            - name: RHEL 9.0
+              test: rhel/9.0
             - name: FreeBSD 12.3
               test: freebsd/12.3
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
+            - name: FreeBSD 13.1
+              test: freebsd/13.1
+          groups:
+            - 1
+            - 2
+            - 3
   - stage: Remote_2_13
     displayName: Remote 2.13
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.13/{0}/1
+          testFormat: 2.13/{0}
           targets:
             - name: MacOS 12.0
               test: macos/12.0
@@ -217,13 +199,17 @@ stages:
               test: freebsd/12.3
             - name: FreeBSD 13.0
               test: freebsd/13.0
+          groups:
+            - 1
+            - 2
+            - 3
   - stage: Remote_2_12
     displayName: Remote 2.12
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.12/{0}/1
+          testFormat: 2.12/{0}
           targets:
             - name: MacOS 11.1
               test: macos/11.1
@@ -235,13 +221,17 @@ stages:
               test: freebsd/12.2
             - name: FreeBSD 13.0
               test: freebsd/13.0
+          groups:
+            - 1
+            - 2
+            - 3
   - stage: Remote_2_11
     displayName: Remote 2.11
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.11/{0}/1
+          testFormat: 2.11/{0}
           targets:
             - name: MacOS 11.1
               test: macos/11.1
@@ -253,32 +243,17 @@ stages:
               test: freebsd/11.4
             - name: FreeBSD 12.2
               test: freebsd/12.2
-  - stage: Remote_2_10
-    displayName: Remote 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.10/{0}/1
-          targets:
-            - name: OS X 10.11
-              test: osx/10.11
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.2
-              test: rhel/8.2
-            - name: FreeBSD 11.1
-              test: freebsd/11.1
-            - name: FreeBSD 12.1
-              test: freebsd/12.1
-
+          groups:
+            - 1
+            - 2
+            - 3
   - stage: Remote_2_9
     displayName: Remote 2.9
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.9/{0}/1
+          testFormat: 2.9/{0}
           targets:
             - name: OS X 10.11
               test: osx/10.11
@@ -290,6 +265,11 @@ stages:
               test: freebsd/11.1
             - name: FreeBSD 12.0
               test: freebsd/12.0
+          groups:
+            - 1
+            - 2
+            - 3
+
 ## Finally
 
   - stage: Summary