From fe38f52ae0c0bff18f8c114c8c98064931bbbea1 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 29 Aug 2021 00:10:14 +0200 Subject: [PATCH] Make sure we don't install a too new python-gitlab for Ansible 2.10. --- tests/utils/shippable/shippable.sh | 2 +- tests/utils/shippable/units.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 3a00812f12..5f94d9fff5 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -232,4 +232,4 @@ fi ansible-test env --dump --show --timeout "${timeout}" --color -v if [ "${SHIPPABLE_BUILD_ID:-}" ]; then "tests/utils/shippable/check_matrix.py"; fi -"tests/utils/shippable/${script}.sh" "${test}" +"tests/utils/shippable/${script}.sh" "${test}" "${ansible_version}" diff --git a/tests/utils/shippable/units.sh b/tests/utils/shippable/units.sh index 38e79935e7..e10712b297 100755 --- a/tests/utils/shippable/units.sh +++ b/tests/utils/shippable/units.sh @@ -22,6 +22,10 @@ esac ansible-test env --timeout "${timeout}" --color -v +if [ "$2" == "2.10" ]; then + echo "python-gitlab < 2.10.1 ; python_version >= '3.6'" >> tests/unit/requirements.txt +fi + # shellcheck disable=SC2086 ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ "${options[@]:+${options[@]}}" \