[stable-1] Restrict redis to < 4.1.0 for ansible-base 2.10 (#3960)
* Restrict redis to < 4.1.0 for ansible-base 2.10. (#3955)
(cherry picked from commit 3f2364574d
)
* Add missing piece.
pull/4093/head
parent
c513c752f8
commit
85d82fbb28
|
@ -244,4 +244,4 @@ fi
|
||||||
ansible-test env --dump --show --timeout "${timeout}" --color -v
|
ansible-test env --dump --show --timeout "${timeout}" --color -v
|
||||||
|
|
||||||
if [ "${SHIPPABLE_BUILD_ID:-}" ]; then "tests/utils/shippable/check_matrix.py"; fi
|
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}"
|
||||||
|
|
|
@ -22,6 +22,10 @@ esac
|
||||||
|
|
||||||
ansible-test env --timeout "${timeout}" --color -v
|
ansible-test env --timeout "${timeout}" --color -v
|
||||||
|
|
||||||
|
if [ "$2" == "2.10" ]; then
|
||||||
|
sed -i -E 's/^redis($| .*)/redis < 4.1.0/g' tests/unit/requirements.txt
|
||||||
|
fi
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
|
ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
|
||||||
"${options[@]:+${options[@]}}" \
|
"${options[@]:+${options[@]}}" \
|
||||||
|
|
Loading…
Reference in New Issue