From 2494a23b95cf1908ad2b30e5448bb49a4f713d7c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 Feb 2025 08:05:11 +0100 Subject: mockit: add "memcached" target --- mockit | 55 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 16 deletions(-) (limited to 'mockit') diff --git a/mockit b/mockit index 6578612..8051de1 100755 --- a/mockit +++ b/mockit @@ -5,14 +5,17 @@ if [ "$2" = "" ]; then 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" + echo -e "\t--nobase | --scl only build PHP SCL packages" + echo -e "\t--noscl | --base only build PHP base packages" + echo -e "\t--mock distro is a mock config name\n" + echo -e "Special distro: all, zts, memcached\n" exit 0 fi # Script options BUILD_BASE=1 BUILD_SCLS=1 +BUILD_MOCK=0 REDIS=0 REMOTE=0 @@ -61,6 +64,11 @@ if [ "$1" == "--nobase" -o "$1" == "--scl" ]; then elif [ "$1" == "--noscl" -o "$1" == "--base" ]; then BUILD_SCLS=0 shift +elif [ "$1" == "--mock" ]; then + BUILD_BASE=0 + BUILD_SCLS=0 + BUILD_MOCK=1 + shift fi SRPM=$1 @@ -82,13 +90,13 @@ else fi case $DIST in - *x) + *x|*xm) if [ $SUF != x ]; then echo "Not an x86_64 builder" exit 1 fi ;; - *a) + *a|*am) if [ $SUF != a ]; then if [ $REDIS -ge 1 ]; then REMOTE=1 @@ -98,18 +106,14 @@ case $DIST in fi fi ;; - *) - DIST=$DIST$SUF - ;; esac # SRPM abolute path +mockref=/home/rpmbuild/SPECS/remirepo/tools/mock +mocketc=$mockref +srpmdir=/home/rpmbuild/site/rpms/SRPMS case $DIST in - *x) - mocketc=/home/rpmbuild/SPECS/remirepo/tools/mock - srpmdir=/home/rpmbuild/site/rpms/SRPMS - ;; - *a) + *a|*am) mocketc=/home/remi/mock srpmdir=/home/remi/SRPMS ;; @@ -152,7 +156,7 @@ case $DIST in LST="72 73 74 80 81 82 83 84" SCL="56 70 71 72 73 74 80 81 82 83 84" ;; - allx) + all) if [ $REDIS -ge 1 ]; then for i in fc39x fc40x fc41x el8x el9x el10x fc39a fc40a fc41a el8a el9a el10a do @@ -163,7 +167,7 @@ case $DIST in echo Not supported for direct build fi ;; - ztsx) + zts) if [ $REDIS -ge 1 ]; then [ $MAX -gt 83 ] && MAX=83 for i in fc39x fc40x el8x el9x @@ -174,9 +178,23 @@ case $DIST in echo Not supported for direct build fi ;; + memcached) + if [ $REDIS -ge 1 ]; then + for i in fc39xm fc40xm fc41x el8x el9xm el10xm fc39am fc40am fc41a el8a el9am el10am + do + $0 --valkey --mock $SRPM $i $MIN $MAX $@ + done + else + echo Not supported for direct build + fi + ;; *) - echo Unkown DIST $DIST - exit 1 + if [ $BUILD_MOCK -eq 0 -o ! -f ${mockref}/${DIST}.cfg ]; then + [ $BUILD_MOCK -eq 0 ] && echo "BUILD_MOCK=0" + [ ! -f ${mocketc}/${DIST}.cfg ] && echo "${mockref}/${DIST}.cfg missing" + echo Unkown DIST $DIST + exit 1 + fi ;; esac @@ -208,6 +226,11 @@ do fi fi done +# Build using mock config +if [ $BUILD_MOCK -ge 1 ]; then + CMD="mock -q --configdir=$mocketc -r ${DIST} rebuild $SRPM $@" + $REDISCLI sadd $QUEUE "$CMD" +fi if [ $REDIS -ge 1 ]; then echo "Queue size: " $($REDISCLI scard $QUEUE) -- cgit