From b2ed187afebfa96ff94f357cc11b5a08ca521a79 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Wed, 14 Aug 2024 17:43:13 +1000
Subject: [PATCH] ci: transition f40, f41 to prefering valkey for testing

---
 build/ci/platforms/fedora40-container.yml |  2 +-
 qa/admin/other-packages/manifest          | 14 ++++++++++++++
 qa/admin/package-lists/Fedora+40+x86_64   | 10 ++++------
 qa/admin/package-lists/Fedora+41+x86_64   |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/build/ci/platforms/fedora40-container.yml b/build/ci/platforms/fedora40-container.yml
index 676e30bd24..0854416c4e 100644
--- a/build/ci/platforms/fedora40-container.yml
+++ b/build/ci/platforms/fedora40-container.yml
@@ -25,7 +25,7 @@ tasks:
     sudo rpm -Uv pcp-*/build/rpm/*.rpm
     echo 'pcpqa ALL=(ALL) NOPASSWD: ALL' | sudo tee /etc/sudoers.d/pcpqa
   init_qa: |
-    sudo systemctl start redis
+    sudo systemctl start valkey
     sudo -i -u pcpqa ./check 002
   qa_sanity: |
     set -o pipefail
diff --git a/qa/admin/other-packages/manifest b/qa/admin/other-packages/manifest
index 6a39516fd6..08d0c1dc13 100644
--- a/qa/admin/other-packages/manifest
+++ b/qa/admin/other-packages/manifest
@@ -1384,6 +1384,20 @@ brew?		mkfs.xfs	[N/A (QA optional)]
 # -- java (bcc PMDA QA)
 dpkg?		/usr/lib/jvm/java-*/lib/server/libjvm.so [openjdk-[0-9][0-9]*-jre-headless or openjdk-[0-9][0-9]*-jre (QA optional)]
 rpm?		/usr/lib/jvm/java-*/lib/server/libjvm.so [java-latest-openjdk-headless or java-[0-9][0-9]*-openjdk-headless (QA optional)]
+# -- valkey (pmproxy, pmseries QA)
+dpkg?		valkey-server	[valkey-server (QA optional)]
+dpkg?		valkey-cli	[valkey-cli or valkey-tools (QA optional)]
+rpm?		valkey-server	[valkey (QA optional)]
+emerge?		valkey-server	[? (QA optional)]
+pkgin?		valkey-server	[N/A (QA optional)]
+pkg_add?	valkey-server	[N/A (QA optional)]
+F_pkg?		valkey-server	[N/A (QA optional)]
+S_pkg?		valkey-server	[N/A (QA optional)]
+slackpkg?	valkey-server	[N/A (QA optional)]
+pacman?		valkey-server	[community/valkey (QA optional)]
+brew?		valkey-server	[valkey (QA optional)]
+# -- valkeysearch (pmproxy, pmsearch QA)
+rpm?		/usr/lib*/valkey/modules/valkeysearch.so	[ValkeySearch (QA optional)]
 # -- redis (pmproxy, pmseries QA)
 dpkg?		redis-server	[redis-server (QA optional)]
 dpkg?		redis-cli	[redis-cli or redis-tools (QA optional)]
diff --git a/qa/admin/package-lists/Fedora+40+x86_64 b/qa/admin/package-lists/Fedora+40+x86_64
index cb8066a723..1668da77e2 100644
--- a/qa/admin/package-lists/Fedora+40+x86_64
+++ b/qa/admin/package-lists/Fedora+40+x86_64
@@ -4,7 +4,7 @@
 389-ds-base
 Coin4-devel
 HdrHistogram_c-devel
-RediSearch
+#RediSearch - switch to ValkeySearch when available
 SoQt-devel
 Spreadsheet::Read cpan
 audit
@@ -101,8 +101,7 @@ pylint
 python3
 python3-bcc
 python3-devel
-# broken dependencies, see https://bugzilla.redhat.com/show_bug.cgi?id=2066462
-# python3-elasticsearch
+python3-elasticsearch
 python3-jsonpointer
 python3-libs
 python3-libvirt
@@ -115,8 +114,7 @@ python3-psycopg2
 python3-pyarrow
 python3-pylint
 python3-pymongo
-# broken dependencies, see https://bugzilla.redhat.com/show_bug.cgi?id=2155256
-# python3-pyodbc
+python3-pyodbc
 python3-requests
 python3-rtslib
 python3-setuptools
@@ -127,7 +125,6 @@ qtchooser
 ragel
 rdma-core-devel
 readline-devel
-redis
 rpm-build
 rrdtool
 rrdtool-perl
@@ -145,6 +142,7 @@ systemd-devel
 systemtap-sdt-devel
 time
 valgrind
+valkey
 xfsprogs
 xkeyboard-config
 xz-devel
diff --git a/qa/admin/package-lists/Fedora+41+x86_64 b/qa/admin/package-lists/Fedora+41+x86_64
index 8f25703116..1a29d795ea 100644
--- a/qa/admin/package-lists/Fedora+41+x86_64
+++ b/qa/admin/package-lists/Fedora+41+x86_64
@@ -125,7 +125,6 @@ qtchooser
 ragel
 rdma-core-devel
 readline-devel
-redis
 rpm-build
 rrdtool
 rrdtool-perl
@@ -146,6 +145,7 @@ systemtap-devel
 systemtap-sdt-devel
 time
 valgrind
+valkey
 xfsprogs
 xkeyboard-config
 xz-devel