From 1b16cb8c7663e79dde261980cdf35a3d7426eeb6 Mon Sep 17 00:00:00 2001 From: Thomas Oulevey Date: Aug 17 2015 06:24:38 +0000 Subject: Add a generic way to add a bootstrap repository for anysig Comment --- diff --git a/scripts/create_sig.sh b/scripts/create_sig.sh index 372bd64..5a40fae 100755 --- a/scripts/create_sig.sh +++ b/scripts/create_sig.sh @@ -120,6 +120,7 @@ do echo " -> Checking $SIG config..." $KOJI add-user $SIG &> /dev/null [ $? -eq 0 ] && echo "Creating user : ${SIG}" + SIGNAME="${SIG}" SIG="${SIG}${DIST}" for PROJECT in $PROJECTS do @@ -166,15 +167,23 @@ do echo " -> creating $R_SIG-$TAG" $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 $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 ) then - # START bootstrap for scl with priority 15 - $KOJI add-external-repo --tag=$R_SIG-$TAG-build sclo7-bootstrap + # START bootstrap for sclo + if [ "x${SIGNAME}" == "xsclo" ] + then + # Priority 15 + $KOJI add-external-repo --tag=$R_SIG-$TAG-build sclo${DIST}-bootstrap + fi # END bootstrap for scl # Other repo can be added here if needed in the future + # if [ "x${SIGNAME}" == "xABC" ] + # Let's use $SIGNAME$DIST-bootstrap to be consitent fi # END bootstrap $KOJI add-group $R_SIG-$TAG-build build @@ -196,7 +205,7 @@ do $KOJI list-tags | grep $P_SIG-common-candidate &> /dev/null [ $? -eq 0 ] && echo "Adding $P_SIG-common-candidate as inheritance" && $KOJI add-tag-inheritance --priority 15 $R_SIG-$TAG-build $P_SIG-common-candidate fi - # Add project common if it exists + # Add SIG -common if it exists $KOJI list-tags | grep $SIG-common-candidate &> /dev/null [ $? -eq 0 ] && echo "Adding $SIG-common-candidate as inheritance" && $KOJI add-tag-inheritance --priority 20 $R_SIG-$TAG-build $SIG-common-candidate # Check if disttag has corresponding buildsys-macros-disttag @@ -206,6 +215,7 @@ do if [ "x$REALTAG" != "x$DEFAULT_DISTTAG" ] then echo " -> [WARN] buildsys-macros-$REALTAG rpm not found. Please build it within koji on target buildsys${DIST}" + #TODO ; generate spec file from tempalte for overriding macros [ -f $PWD/etc/buildsys.spec.template ] && echo " -> Generating buildsys-macros-$TAG.spec" fi fi