From 85d82fbb282a23b51c7c3f598b78c31c5ab768d8 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 27 Dec 2021 22:48:21 +0100
Subject: [PATCH] [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 3f2364574d3c3980c1215da6c105f6ddaa7b5e0c)

* Add missing piece.
---
 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 d22a6df74d..557d04e4d3 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -244,4 +244,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..bfc72f6389 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
+    sed -i -E 's/^redis($| .*)/redis < 4.1.0/g' tests/unit/requirements.txt
+fi
+
 # shellcheck disable=SC2086
 ansible-test units --color -v --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
     "${options[@]:+${options[@]}}" \