ci: transition f40, f41 to prefering valkey for testing

natoscott · Aug 14, 2024 · c4317ba · c4317ba
1 parent 6cd358a
commit c4317ba
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/build/ci/platforms/fedora-rawhide-container.yml b/build/ci/platforms/fedora-rawhide-container.yml
@@ -23,7 +23,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/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
@@ -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
@@ -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,7 @@ qtchooser
 ragel
 rdma-core-devel
 readline-devel
-redis
+valkey
 rpm-build
 rrdtool
 rrdtool-perl

diff --git a/qa/admin/package-lists/Fedora+41+x86_64 b/qa/admin/package-lists/Fedora+41+x86_64
@@ -125,7 +125,7 @@ qtchooser
 ragel
 rdma-core-devel
 readline-devel
-redis
+valkey
 rpm-build
 rrdtool
 rrdtool-perl