From d01cf3adb4234ef6ddf74251b3bf4d8bd2f056e2 Mon Sep 17 00:00:00 2001
From: Reid Sunderland <reid.sunderland@ssc-spc.gc.ca>
Date: Thu, 10 Oct 2024 20:09:58 +0000
Subject: [PATCH 1/3] quick attempt at fixing redis flow tests

---
 .github/workflows/flow_redis.yml |  1 +
 travis/add_redis.sh              | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/flow_redis.yml b/.github/workflows/flow_redis.yml
index 492b89f63..efd6bb1bb 100644
--- a/.github/workflows/flow_redis.yml
+++ b/.github/workflows/flow_redis.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - v03_disabled
+      - **redis**
     
     paths-ignore:
       - '.github/**'
diff --git a/travis/add_redis.sh b/travis/add_redis.sh
index 2213868f6..bb033391d 100755
--- a/travis/add_redis.sh
+++ b/travis/add_redis.sh
@@ -73,9 +73,25 @@ else
 fi
 echo -e "..done\n"
 
+# later OS versions have later versions of pip that require convincing to actually install.
+. /etc/os-release
+if [ "${VERSION_ID}" \> "22.04" ]; then
+        pip_install="pip3 install --break-system-packages --user "
+else
+        pip_install="pip3 install "
+fi
+
 echo "Install Redis Python modules... "
 # Install Python modules
-pip3 install redis python-redis-lock
+sudo apt -y install python3-redis || true
+for PKG in redis python-redis-lock; do
+    PKG_INSTALLED="`pip3 list | grep ${PKG}`"
+    if [ "$?" == "0" ] ; then
+        echo "$PKG is already installed"
+    else
+        ${pip_install} ${PKG}
+    fi
+done
 echo -e "..done\n"
 
 echo "Add redis options to sr3 default config... "

From c289b7ccefca1778b35a09898968452ea96fe942 Mon Sep 17 00:00:00 2001
From: Reid Sunderland <reid.sunderland@ssc-spc.gc.ca>
Date: Thu, 10 Oct 2024 20:11:36 +0000
Subject: [PATCH 2/3] add quotes to wildcarded branches containing the word
 redis

---
 .github/workflows/flow_redis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/flow_redis.yml b/.github/workflows/flow_redis.yml
index efd6bb1bb..3c429fa68 100644
--- a/.github/workflows/flow_redis.yml
+++ b/.github/workflows/flow_redis.yml
@@ -6,7 +6,7 @@ on:
   push:
     branches:
       - v03_disabled
-      - **redis**
+      - '**redis**'
     
     paths-ignore:
       - '.github/**'

From 077072987d024f9fad02eb5d68ed80322cf567d8 Mon Sep 17 00:00:00 2001
From: Reid Sunderland <reid.sunderland@ssc-spc.gc.ca>
Date: Thu, 10 Oct 2024 20:22:23 +0000
Subject: [PATCH 3/3] **redis** didn't work for branches...

---
 .github/workflows/flow_redis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/flow_redis.yml b/.github/workflows/flow_redis.yml
index 3c429fa68..1cde2dadb 100644
--- a/.github/workflows/flow_redis.yml
+++ b/.github/workflows/flow_redis.yml
@@ -6,7 +6,7 @@ on:
   push:
     branches:
       - v03_disabled
-      - '**redis**'
+      - '*redis*'
     
     paths-ignore:
       - '.github/**'