Reduce CI test matrix.

4 files changed, 21 insertions, 72 deletions

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 0a6c7bb18f..c71d47b8bf 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -106,16 +106,10 @@ stages:
       - template: templates/matrix.yml
         parameters:
           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.0
-              test: freebsd/12.0
           groups:
             - 1
             - 2
@@ -132,14 +126,6 @@ stages:
               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
@@ -149,56 +135,13 @@ stages:
             - 2
             - 3
             - 4
-  - stage: AWS
+  - stage: Galaxy
     dependsOn: []
     jobs:
       - template: templates/matrix.yml
         parameters:
           nameFormat: Python {0}
-          testFormat: aws/{0}
-          targets:
-            - test: 2.7
-            - test: 3.6
-          groups:
-            - 1
-            - 2
-  - stage: vCenter
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: vcenter/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: CloudStack
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: cs/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: Cloud
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: cloud/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.6
-  - stage: Hetzner
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: hcloud/{0}/1
+          testFormat: galaxy/{0}/1
           targets:
             - test: 2.7
             - test: 3.6
@@ -211,10 +154,6 @@ stages:
       - Network
       - Remote
       - Docker
-      - AWS
-      - vCenter
-      - CloudStack
-      - Cloud
-      - Hetzner
+      - Galaxy
     jobs:
       - template: templates/coverage.yml
diff --git a/test/integration/targets/ansible-galaxy-collection/aliases b/test/integration/targets/ansible-galaxy-collection/aliases
index 8af920aef1..9f51f6fe55 100644
--- a/test/integration/targets/ansible-galaxy-collection/aliases
+++ b/test/integration/targets/ansible-galaxy-collection/aliases
@@ -1,3 +1,2 @@
-shippable/cloud/group1
-shippable/cloud/smoketest
+shippable/galaxy/group1
 cloud/fallaxy
diff --git a/test/lib/ansible_test/_internal/sanity/integration_aliases.py b/test/lib/ansible_test/_internal/sanity/integration_aliases.py
index 8c43e3416e..594f55e827 100644
--- a/test/lib/ansible_test/_internal/sanity/integration_aliases.py
+++ b/test/lib/ansible_test/_internal/sanity/integration_aliases.py
@@ -258,12 +258,6 @@ class IntegrationAliasesTest(SanityVersionNeutral):
             find=self.format_test_group_alias('linux').replace('linux', 'posix'),
         )
 
-        for cloud in clouds:
-            messages += self.check_ci_group(
-                targets=tuple(filter_targets(posix_targets, ['cloud/%s/' % cloud], include=True, directories=False, errors=False)),
-                find=self.format_test_group_alias(cloud, 'cloud'),
-            )
-
         return messages
 
     def check_windows_targets(self):
diff --git a/test/utils/shippable/galaxy.sh b/test/utils/shippable/galaxy.sh
new file mode 100755
index 0000000000..90a8955e31
--- /dev/null
+++ b/test/utils/shippable/galaxy.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -o pipefail -eux
+
+declare -a args
+IFS='/:' read -ra args <<< "$1"
+
+python="${args[1]}"
+group="${args[2]}"
+
+target="shippable/galaxy/group${group}/"
+
+stage="${S:-prod}"
+
+# shellcheck disable=SC2086
+ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
+    --remote-terminate always --remote-stage "${stage}" --docker --python "${python}"