diff options
| author | Matt Clay <matt@mystile.com> | 2023-07-11 16:28:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-11 16:28:34 -0700 |
| commit | 7f543f3d5f4e81fe3c143e10b9debcdc198a4e52 (patch) | |
| tree | 662ca1695883776967d4e8b2a4e8532f3146c54c /.azure-pipelines | |
| parent | 65f76121fb20c9702d13868e724d292f3c9979ac (diff) | |
| download | ansible-7f543f3d5f4e81fe3c143e10b9debcdc198a4e52.zip | |
[stable-2.14] Reorganize CI sanity test matrix (#81004) (#81226)
(cherry picked from commit ff359fa8e11c7b84a67e286e95c606c06b02152f)
Diffstat (limited to '.azure-pipelines')
| -rw-r--r-- | .azure-pipelines/azure-pipelines.yml | 2 | ||||
| -rwxr-xr-x | .azure-pipelines/commands/sanity.sh | 41 |
2 files changed, 36 insertions, 7 deletions
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 38d9a02035..721fa82a58 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -47,8 +47,6 @@ stages: - test: 1 - test: 2 - test: 3 - - test: 4 - - test: 5 - stage: Units dependsOn: [] jobs: diff --git a/.azure-pipelines/commands/sanity.sh b/.azure-pipelines/commands/sanity.sh index 75aea309ff..78046f65e1 100755 --- a/.azure-pipelines/commands/sanity.sh +++ b/.azure-pipelines/commands/sanity.sh @@ -7,12 +7,43 @@ IFS='/:' read -ra args <<< "$1" group="${args[1]}" +group2_include=( + ansible-doc + changelog + package-data + pep8 + pylint + validate-modules +) + +group3_include=( + docs-build + sanity-docs +) + +group1_exclude=( + "${group2_include[@]}" + "${group3_include[@]}" +) + +options=() + case "${group}" in - 1) options=(--skip-test pylint --skip-test ansible-doc --skip-test docs-build --skip-test package-data --skip-test changelog --skip-test validate-modules) ;; - 2) options=( --test ansible-doc --test docs-build --test package-data --test changelog) ;; - 3) options=(--test pylint --exclude test/units/ --exclude lib/ansible/module_utils/) ;; - 4) options=(--test pylint test/units/ lib/ansible/module_utils/) ;; - 5) options=( --test validate-modules) ;; + 1) + for name in "${group1_exclude[@]}"; do + options+=(--skip-test "${name}") + done + ;; + 2) + for name in "${group2_include[@]}"; do + options+=(--test "${name}") + done + ;; + 3) + for name in "${group3_include[@]}"; do + options+=(--test "${name}") + done + ;; esac # shellcheck disable=SC2086 |