Re-organize CI test groups for POSIX tests. (ansible#77420)

* `context/target` tests must be in groups 1 - 2. * `context/controller` tests must be in groups 3 - 5. This makes it easier to efficiently organize groups and balance test runtimes.
webknjaz · Aug 4, 2022 · 02e9881 · 02e9881
1 parent 7e634f5
commit 02e9881
Show file tree

Hide file tree

Showing 195 changed files with 244 additions and 193 deletions.
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
@@ -104,6 +104,18 @@ stages:
           groups:
             - 1
             - 2
+      - template: templates/matrix.yml
+        parameters:
+          targets:
+            - name: macOS 12.0
+              test: macos/12.0
+            - name: RHEL 8.6
+              test: rhel/8.6
+            - name: RHEL 9.0
+              test: rhel/9.0
+            - name: FreeBSD 13.1
+              test: freebsd/13.1
+          groups:
             - 3
             - 4
             - 5
@@ -131,6 +143,19 @@ stages:
           groups:
             - 1
             - 2
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: linux/{0}
+          targets:
+            - name: Alpine 3
+              test: alpine3
+            - name: Fedora 35
+              test: fedora35
+            - name: Fedora 36
+              test: fedora36
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+          groups:
             - 3
             - 4
             - 5

diff --git a/test/integration/targets/adhoc/aliases b/test/integration/targets/adhoc/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/ansible-doc/aliases b/test/integration/targets/ansible-doc/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/ansible-galaxy-collection-scm/aliases b/test/integration/targets/ansible-galaxy-collection-scm/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group4
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/ansible-galaxy-role/aliases b/test/integration/targets/ansible-galaxy-role/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group4
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/ansible-galaxy/aliases b/test/integration/targets/ansible-galaxy/aliases
@@ -1,3 +1,3 @@
 destructive
-shippable/posix/group4
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/ansible-inventory/aliases b/test/integration/targets/ansible-inventory/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/ansible-pull/aliases b/test/integration/targets/ansible-pull/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/ansible-runner/aliases b/test/integration/targets/ansible-runner/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
 skip/osx
 skip/macos

diff --git a/test/integration/targets/ansible-test-cloud-httptester/aliases b/test/integration/targets/ansible-test-cloud-httptester/aliases
@@ -1,3 +1,3 @@
 needs/httptester  # using legacy alias for testing purposes
-shippable/posix/group1
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/ansible-test-config-invalid/aliases b/test/integration/targets/ansible-test-config-invalid/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group1  # runs in the distro test containers
+shippable/posix/group3  # runs in the distro test containers
 shippable/generic/group1  # runs in the default test container
 context/controller
 needs/target/collection
diff --git a/test/integration/targets/ansible-test-config/aliases b/test/integration/targets/ansible-test-config/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group1  # runs in the distro test containers
+shippable/posix/group3  # runs in the distro test containers
 shippable/generic/group1  # runs in the default test container
 context/controller
 needs/target/collection
diff --git a/test/integration/targets/ansible-test-no-tty/aliases b/test/integration/targets/ansible-test-no-tty/aliases
@@ -1,4 +1,4 @@
 context/controller
-shippable/posix/group1  # runs in the distro test containers
+shippable/posix/group3  # runs in the distro test containers
 shippable/generic/group1  # runs in the default test container
 needs/target/collection
diff --git a/test/integration/targets/ansible-test-sanity-lint/aliases b/test/integration/targets/ansible-test-sanity-lint/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group1  # runs in the distro test containers
+shippable/posix/group3  # runs in the distro test containers
 shippable/generic/group1  # runs in the default test container
 context/controller
 needs/target/collection
diff --git a/test/integration/targets/ansible-test-sanity-shebang/aliases b/test/integration/targets/ansible-test-sanity-shebang/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group1  # runs in the distro test containers
+shippable/posix/group3  # runs in the distro test containers
 shippable/generic/group1  # runs in the default test container
 context/controller
 needs/target/collection
diff --git a/test/integration/targets/ansible-test-shell/aliases b/test/integration/targets/ansible-test-shell/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group1  # runs in the distro test containers
+shippable/posix/group3  # runs in the distro test containers
 shippable/generic/group1  # runs in the default test container
 context/controller
 needs/target/collection
diff --git a/test/integration/targets/ansible-test/aliases b/test/integration/targets/ansible-test/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group1  # runs in the distro test containers
+shippable/posix/group3  # runs in the distro test containers
 shippable/generic/group1  # runs in the default test container
 context/controller
 needs/target/collection

diff --git a/test/integration/targets/ansible-vault/aliases b/test/integration/targets/ansible-vault/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/ansible/aliases b/test/integration/targets/ansible/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group4
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/any_errors_fatal/aliases b/test/integration/targets/any_errors_fatal/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/apt/aliases b/test/integration/targets/apt/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group5
+shippable/posix/group2
 destructive
 skip/freebsd
 skip/osx

diff --git a/test/integration/targets/args/aliases b/test/integration/targets/args/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/argspec/aliases b/test/integration/targets/argspec/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/assert/aliases b/test/integration/targets/assert/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller  # this is a controller-only action, the module is just for documentation
diff --git a/test/integration/targets/async_extra_data/aliases b/test/integration/targets/async_extra_data/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group2
 context/target
diff --git a/test/integration/targets/become_su/aliases b/test/integration/targets/become_su/aliases
@@ -1,3 +1,3 @@
 destructive
-shippable/posix/group1
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/become_unprivileged/aliases b/test/integration/targets/become_unprivileged/aliases
@@ -1,5 +1,5 @@
 destructive
-shippable/posix/group1
+shippable/posix/group3
 needs/ssh
 needs/root
 context/controller
diff --git a/test/integration/targets/binary_modules_posix/aliases b/test/integration/targets/binary_modules_posix/aliases
@@ -1,3 +1,3 @@
-shippable/posix/group3
+shippable/posix/group2
 needs/target/binary_modules
 context/target
diff --git a/test/integration/targets/blocks/aliases b/test/integration/targets/blocks/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/builtin_vars_prompt/aliases b/test/integration/targets/builtin_vars_prompt/aliases
@@ -1,4 +1,4 @@
 setup/always/setup_passlib
 setup/always/setup_pexpect
-shippable/posix/group4
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/callback_default/aliases b/test/integration/targets/callback_default/aliases
@@ -1 +1 @@
-shippable/posix/group1
+shippable/posix/group3
diff --git a/test/integration/targets/changed_when/aliases b/test/integration/targets/changed_when/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/check_mode/aliases b/test/integration/targets/check_mode/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/cli/aliases b/test/integration/targets/cli/aliases
@@ -2,5 +2,5 @@ destructive
 needs/root
 needs/ssh
 needs/target/setup_pexpect
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/collections/aliases b/test/integration/targets/collections/aliases
@@ -1,4 +1,4 @@
 posix
-shippable/posix/group4
+shippable/posix/group1
 shippable/windows/group1
 windows
diff --git a/test/integration/targets/collections_plugin_namespace/aliases b/test/integration/targets/collections_plugin_namespace/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/collections_runtime_pythonpath/aliases b/test/integration/targets/collections_runtime_pythonpath/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group4
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/command_nonexisting/aliases b/test/integration/targets/command_nonexisting/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/common_network/aliases b/test/integration/targets/common_network/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/conditionals/aliases b/test/integration/targets/conditionals/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/config/aliases b/test/integration/targets/config/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/connection_delegation/aliases b/test/integration/targets/connection_delegation/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller
 skip/freebsd  # No sshpass
 skip/osx  # No sshpass

diff --git a/test/integration/targets/connection_local/aliases b/test/integration/targets/connection_local/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 needs/target/connection
diff --git a/test/integration/targets/connection_paramiko_ssh/aliases b/test/integration/targets/connection_paramiko_ssh/aliases
@@ -1,5 +1,5 @@
 needs/ssh
-shippable/posix/group3
+shippable/posix/group5
 needs/target/setup_paramiko
 needs/target/connection
 destructive  # potentially installs/uninstalls OS packages via setup_paramiko
diff --git a/test/integration/targets/connection_remote_is_local/aliases b/test/integration/targets/connection_remote_is_local/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/connection_ssh/aliases b/test/integration/targets/connection_ssh/aliases
@@ -1,3 +1,3 @@
 needs/ssh
-shippable/posix/group1
+shippable/posix/group3
 needs/target/connection
diff --git a/test/integration/targets/controller/aliases b/test/integration/targets/controller/aliases
@@ -1,2 +1,2 @@
 context/controller
-shippable/posix/group1
+shippable/posix/group3
diff --git a/test/integration/targets/cron/aliases b/test/integration/targets/cron/aliases
@@ -1,4 +1,4 @@
 destructive
-shippable/posix/group4
+shippable/posix/group1
 skip/osx
 skip/macos
diff --git a/test/integration/targets/dataloader/aliases b/test/integration/targets/dataloader/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/debug/aliases b/test/integration/targets/debug/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller  # this is a controller-only action, the module is just for documentation
diff --git a/test/integration/targets/debugger/aliases b/test/integration/targets/debugger/aliases
@@ -1,3 +1,3 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller
 setup/always/setup_pexpect
diff --git a/test/integration/targets/delegate_to/aliases b/test/integration/targets/delegate_to/aliases
@@ -1,4 +1,4 @@
-shippable/posix/group3
+shippable/posix/group5
 needs/ssh
 needs/root  # only on macOS and FreeBSD to configure network interfaces
 context/controller
diff --git a/test/integration/targets/dict_transformations/aliases b/test/integration/targets/dict_transformations/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/dnf/aliases b/test/integration/targets/dnf/aliases
@@ -1,5 +1,5 @@
 destructive
-shippable/posix/group4
+shippable/posix/group1
 skip/power/centos
 skip/freebsd
 skip/osx

diff --git a/test/integration/targets/egg-info/aliases b/test/integration/targets/egg-info/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group1
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/entry_points/aliases b/test/integration/targets/entry_points/aliases
@@ -1,2 +1,2 @@
 context/controller
-shippable/posix/group5
+shippable/posix/group4
diff --git a/test/integration/targets/environment/aliases b/test/integration/targets/environment/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group2
 context/target
diff --git a/test/integration/targets/error_from_connection/aliases b/test/integration/targets/error_from_connection/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/facts_linux_network/aliases b/test/integration/targets/facts_linux_network/aliases
@@ -1,5 +1,5 @@
 needs/privileged
-shippable/posix/group2
+shippable/posix/group1
 skip/freebsd
 skip/osx
 skip/macos

diff --git a/test/integration/targets/failed_when/aliases b/test/integration/targets/failed_when/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/filter_core/aliases b/test/integration/targets/filter_core/aliases
@@ -1 +1 @@
-shippable/posix/group2
+shippable/posix/group4
diff --git a/test/integration/targets/filter_encryption/aliases b/test/integration/targets/filter_encryption/aliases
@@ -1 +1 @@
-shippable/posix/group2
+shippable/posix/group4
diff --git a/test/integration/targets/filter_mathstuff/aliases b/test/integration/targets/filter_mathstuff/aliases
@@ -1 +1 @@
-shippable/posix/group2
+shippable/posix/group4
diff --git a/test/integration/targets/filter_urls/aliases b/test/integration/targets/filter_urls/aliases
@@ -1 +1 @@
-shippable/posix/group2
+shippable/posix/group4
diff --git a/test/integration/targets/filter_urlsplit/aliases b/test/integration/targets/filter_urlsplit/aliases
@@ -1 +1 @@
-shippable/posix/group2
+shippable/posix/group4
diff --git a/test/integration/targets/gathering/aliases b/test/integration/targets/gathering/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/gathering_facts/aliases b/test/integration/targets/gathering_facts/aliases
@@ -1,3 +1,3 @@
-shippable/posix/group3
+shippable/posix/group5
 needs/root
 context/controller
diff --git a/test/integration/targets/git/aliases b/test/integration/targets/git/aliases
@@ -1 +1 @@
-shippable/posix/group4
+shippable/posix/group1
diff --git a/test/integration/targets/group_by/aliases b/test/integration/targets/group_by/aliases
@@ -1 +1 @@
-shippable/posix/group3
+shippable/posix/group2
diff --git a/test/integration/targets/groupby_filter/aliases b/test/integration/targets/groupby_filter/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/handler_race/aliases b/test/integration/targets/handler_race/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/handlers/aliases b/test/integration/targets/handlers/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/hardware_facts/aliases b/test/integration/targets/hardware_facts/aliases
@@ -1,4 +1,4 @@
 destructive
 needs/privileged
-shippable/posix/group2
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/hash/aliases b/test/integration/targets/hash/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/hosts_field/aliases b/test/integration/targets/hosts_field/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/ignore_errors/aliases b/test/integration/targets/ignore_errors/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group4
+shippable/posix/group3
 context/controller
diff --git a/test/integration/targets/ignore_unreachable/aliases b/test/integration/targets/ignore_unreachable/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group3
+shippable/posix/group5
 context/controller
diff --git a/test/integration/targets/import_tasks/aliases b/test/integration/targets/import_tasks/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group4
 context/controller  # this is a controller-only action, the module is just for documentation
diff --git a/test/integration/targets/include_import/aliases b/test/integration/targets/include_import/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group5
+shippable/posix/group4
 context/controller
diff --git a/test/integration/targets/include_vars-ad-hoc/aliases b/test/integration/targets/include_vars-ad-hoc/aliases
@@ -1,2 +1,2 @@
-shippable/posix/group2
+shippable/posix/group4
 context/controller