From 05da88bba49c404663d2013734a1c2715928d9ae Mon Sep 17 00:00:00 2001 From: Thomas Oulevey Date: Nov 28 2016 07:45:36 +0000 Subject: Add -extras as default for c5, c6, c7 Add -cr as default for c7 with higher priority --- diff --git a/scripts/create_sig.sh b/scripts/create_sig.sh index d072594..f83dc62 100755 --- a/scripts/create_sig.sh +++ b/scripts/create_sig.sh @@ -8,7 +8,7 @@ usage: $0 -d -s -t This script generate new build target in koji for SIGS. OPTIONS: - -a ARCHES : Force arches e.g : "x86_64","aarch64 i686", etc... + -a ARCHES : Force arches e.g : "x86_64","aarch64 i686", etc... -b : Enable non public bootstrap repo (SCLO SIG only) -c COLLECTION : Enable collection in the buildroot e.g : mariadb100 @@ -88,7 +88,7 @@ shift $(($OPTIND - 1)) if ! ( $optiond && $options && $optiont ) then usage - exit 0 + exit 0 fi # Check if user is allowed to send command to koji and has 'admin' permission @@ -124,6 +124,9 @@ do $KOJI list-tags | grep buildsys${DIST} &> /dev/null [ $? -gt 0 ] && echo " -> [ERROR] Something is wrong buildsys${DIST} tag not found." && continue + $KOJI list-external-repos | grep ^centos${DIST}-extras &> /dev/null + [ $? -gt 0 ] && echo " -> [ERROR] centos${DIST}-extras external repo not configured in koji." && continue + $KOJI list-external-repos | grep ^centos${DIST}-os &> /dev/null [ $? -gt 0 ] && echo " -> [ERROR] centos${DIST}-os external repo not configured in koji." && continue @@ -157,8 +160,8 @@ do #then # echo "Creating tag : ${P_SIG}-common" # $KOJI add-tag $P_SIG-common-candidate - # - #fi + # + #fi for RELEASE in $RELEASES do R_SIG="${P_SIG}-${RELEASE}" @@ -179,7 +182,7 @@ do # TAG="$TAG-$COLLECTIONS" TAG="$TAG" fi - $KOJI list-tags | grep $R_SIG-$TAG-build &> /dev/null + $KOJI list-tags | grep $R_SIG-$TAG-build &> /dev/null if [ $? -eq 0 ] then if ( $optionx ) @@ -194,8 +197,12 @@ do $KOJI add-tag --arches "$ARCHES" $R_SIG-$TAG-build $KOJI add-target $R_SIG-$TAG $R_SIG-$TAG-build $R_SIG-candidate # For external repo priorites are increased by 5, Priority 5 + if [ "x$DIST" == "x7" ] + then + $KOJI add-external-repo --tag=$R_SIG-$TAG-build centos${DIST}-cr + fi + $KOJI add-external-repo --tag=$R_SIG-$TAG-build centos${DIST}-extras $KOJI add-external-repo --tag=$R_SIG-$TAG-build centos${DIST}-updates - # Priority 10 $KOJI add-external-repo --tag=$R_SIG-$TAG-build centos${DIST}-os # START bootstrap if ( $optionb )