summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-11-07 11:39:11 +0100
committerRemi Collet <remi@php.net>2024-11-07 11:39:11 +0100
commit4e47b1c4178d91d211ac87d41d859b6c8f6568c8 (patch)
tree540c8db344203a7a06ffdd4e719ada2e0472ee83
parentd2133b8dc11e650ff260127a3f95fde87d842af4 (diff)
switch to valkeyHEADmaster
-rwxr-xr-xmockit13
-rwxr-xr-xmockrun4
2 files changed, 9 insertions, 8 deletions
diff --git a/mockit b/mockit
index d7f859b..c3a3c1d 100755
--- a/mockit
+++ b/mockit
@@ -3,6 +3,7 @@
if [ "$2" = "" ]; then
echo -e "\nusage: $0 [ options ] SRPM distro [ min_ver [, max_ver [, mock_options ]]]\n"
echo -e "\t--redis store build command in redis queue"
+ echo -e "\t--valkey store build command in valkey queue"
echo -e "\t--list list queue content"
echo -e "\t--nobase | --scl only build SCL packages"
echo -e "\t--noscl | --base only build base packages\n"
@@ -19,14 +20,14 @@ REMOTE=0
if [ "$(uname -m)" = "x86_64" ]; then
SUF=x
QUEUE=mockx
- REDISCLI="redis-cli"
+ REDISCLI="valkey-cli"
else
SUF=a
QUEUE=mocka
- REDISCLI="redis-cli -h remi"
+ REDISCLI="valkey-cli -h remi"
fi
-if [ "$1" == "--redis" ]; then
+if [ "$1" == "--redis" -o "$1" == "--valkey" ]; then
CHECK=$($REDISCLI ping)
[ "$CHECK" = "PONG" ] || exit 1
REDIS=1
@@ -147,8 +148,8 @@ case $DIST in
if [ $REDIS -ge 1 ]; then
for i in fc39x fc40x fc41x el8x el9x fc39a fc40a fc41a el8a el9a
do
- [ $BUILD_BASE -ge 1 ] && $0 --redis --base $SRPM $i $MIN $MAX $@
- [ $BUILD_SCLS -ge 1 ] && $0 --redis --scl $SRPM $i $MIN $MAX $@
+ [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@
+ [ $BUILD_SCLS -ge 1 ] && $0 --valkey --scl $SRPM $i $MIN $MAX $@
done
else
echo Not supported for direct build
@@ -159,7 +160,7 @@ case $DIST in
[ $MAX -gt 83 ] && MAX=83
for i in fc39x fc40x el8x el9x
do
- [ $BUILD_BASE -ge 1 ] && $0 --redis --base $SRPM $i $MIN $MAX $@
+ [ $BUILD_BASE -ge 1 ] && $0 --valkey --base $SRPM $i $MIN $MAX $@
done
else
echo Not supported for direct build
diff --git a/mockrun b/mockrun
index cf0efeb..98faf60 100755
--- a/mockrun
+++ b/mockrun
@@ -3,10 +3,10 @@
# ARCH detection and check
if [ "$(uname -m)" = "x86_64" ]; then
QUEUE=mockx
- REDISCLI="redis-cli"
+ REDISCLI="valkey-cli"
else
QUEUE=mocka
- REDISCLI="redis-cli -h remi"
+ REDISCLI="valkey-cli -h remi"
fi
CHECK=$($REDISCLI ping)