diff options
author | Matt Clay <matt@mystile.com> | 2022-04-25 10:24:36 -0700 |
---|---|---|
committer | Matt Clay <matt@mystile.com> | 2022-04-25 14:01:38 -0700 |
commit | 3f5a4a7c6a7d8db7b9cc405b5bce3e9ee23b8943 (patch) | |
tree | 96623ea393dc0b64f773c5dafbe8f78df896966c /test | |
parent | 1cc8f978f64be8ba71d22bda0ccf6dd1289b0803 (diff) | |
download | ansible-3f5a4a7c6a7d8db7b9cc405b5bce3e9ee23b8943.tar.gz |
Reduce CI test matrix.
Diffstat (limited to 'test')
-rw-r--r-- | test/integration/targets/ansible-galaxy-collection/aliases | 3 | ||||
-rw-r--r-- | test/lib/ansible_test/_internal/sanity/integration_aliases.py | 6 | ||||
-rwxr-xr-x | test/utils/shippable/galaxy.sh | 17 |
3 files changed, 18 insertions, 8 deletions
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}" |