diff options
| author | Matt Clay <matt@mystile.com> | 2023-03-13 15:29:09 -0700 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2023-03-15 13:08:23 -0700 |
| commit | a35e8015e54fb48b748ef827b64201e9964f4754 (patch) | |
| tree | 4ffca4e0fbd5b6bf2b7ddbefde30f532e8ac250b /.azure-pipelines | |
| parent | 8cc8aa268d81fd991e6574336272a2e4f5422574 (diff) | |
| download | ansible-a35e8015e54fb48b748ef827b64201e9964f4754.tar.gz | |
[stable-2.13] ansible-test - Update git diff handling (#80202)
This change allows ansible-test to work with newer versions of git on AZP.
(cherry picked from commit bad8843124a50493141a3e3d7920353239021389)
Co-authored-by: Matt Clay <matt@mystile.com>
Diffstat (limited to '.azure-pipelines')
| -rwxr-xr-x | .azure-pipelines/commands/sanity.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.azure-pipelines/commands/sanity.sh b/.azure-pipelines/commands/sanity.sh index 6dc4d1da9a..75aea309ff 100755 --- a/.azure-pipelines/commands/sanity.sh +++ b/.azure-pipelines/commands/sanity.sh @@ -7,12 +7,6 @@ IFS='/:' read -ra args <<< "$1" group="${args[1]}" -if [ "${BASE_BRANCH:-}" ]; then - base_branch="origin/${BASE_BRANCH}" -else - base_branch="" -fi - 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) ;; @@ -23,5 +17,5 @@ esac # shellcheck disable=SC2086 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ - --docker --keep-git --base-branch "${base_branch}" \ + --docker \ "${options[@]}" --allow-disabled |