From 8990511c49fce5422a7457828d3aff5e70c50f1c Mon Sep 17 00:00:00 2001
From: Thomas Oulevey <thomas.oulevey@cern.ch>
Date: Mar 03 2017 15:55:54 +0000
Subject: Make SIG/PROJECT buildroot configurable


---

diff --git a/scripts/create_sig.sh b/scripts/create_sig.sh
index 527c80d..b19d02d 100755
--- a/scripts/create_sig.sh
+++ b/scripts/create_sig.sh
@@ -93,6 +93,7 @@ fi
 KOJI=`which koji`
 PERMS=`$KOJI list-permissions --mine`
 ADMIN=false
+CONFIG_PATH="$(dirname $BASH_SOURCE)/sigs"
 
 for P in $PERMS
 do
@@ -133,6 +134,9 @@ do
 
 	for SIG in $SIGS
 	do
+		# reset values from SIG configuation file
+		BUILDROOT_DEFAULT=""
+
 		echo " -> Checking $SIG config..."
 		$KOJI add-user $SIG &> /dev/null
 		[ $? -eq 0 ] && echo "Creating user : ${SIG}" && $KOJI grant-permission --new build-${SIG} $SIG
@@ -204,10 +208,10 @@ do
 					$KOJI add-external-repo --tag=$R_SIG-$TAG-build centos${DIST}-os
 					# START bootstrap
 					if ( $optionb )
-                        		then
+                   	then
 						# START bootstrap for sclo
 						if [ "x${SIGNAME}" == "xsclo" ]
-                				then
+                		then
 							# Priority 15
 							$KOJI add-external-repo --tag=$R_SIG-$TAG-build sclo${DIST}-bootstrap
 						fi
@@ -220,13 +224,23 @@ do
 					$KOJI add-group $R_SIG-$TAG-build build
 					$KOJI add-group $R_SIG-$TAG-build srpm-build
 					# Add <collection>-build to the buildroot if collection enabled
+					if [ -f $CONFIG_PATH/$SIGNAME/$PROJECT/config.sh ]
+					then
+						echo "Using specific $SIGNAME/$PROJECT options: "
+						echo "###"
+						cat $CONFIG_PATH/$SIGNAME/$PROJECT/config.sh
+						echo "###"
+						source $CONFIG_PATH/$SIGNAME/$PROJECT/config.sh
+					else
+						BUILDROOT_DEFAULT="curl bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-tools tar"
+					fi
 					if ( $optionc )
-                        		then
-						$KOJI add-group-pkg $R_SIG-$TAG-build build bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build scl-utils-build
-				        $KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build scl-utils-build
+					then
+						$KOJI add-group-pkg $R_SIG-$TAG-build build $BUILDROOT_DEFAULT buildsys-macros-$REALTAG $COLLECTIONS-build scl-utils-build
+				        $KOJI add-group-pkg $R_SIG-$TAG-build srpm-build $BUILDROOT_DEFAULT buildsys-macros-$REALTAG $COLLECTIONS-build scl-utils-build
 					else
-						$KOJI add-group-pkg $R_SIG-$TAG-build build bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-macros-$REALTAG tar buildsys-tools $BUILDROOT_PKGS_EXTRAS
-                        $KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools $BUILDROOT_PKGS_EXTRAS
+						$KOJI add-group-pkg $R_SIG-$TAG-build build $BUILDROOT_DEFAULT buildsys-macros-$REALTAG $BUILDROOT_PKGS_EXTRAS
+                        $KOJI add-group-pkg $R_SIG-$TAG-build srpm-build $BUILDROOT_DEFAULT buildsys-macros-$REALTAG $BUILDROOT_PKGS_EXTRAS
 					fi
 					$KOJI add-tag-inheritance --priority 5 $R_SIG-$TAG-build buildsys${DIST}
 					$KOJI add-tag-inheritance --priority 10 $R_SIG-$TAG-build $R_SIG-candidate
diff --git a/scripts/sigs/cloud/openstack/config.sh b/scripts/sigs/cloud/openstack/config.sh
new file mode 100644
index 0000000..9d2a8c5
--- /dev/null
+++ b/scripts/sigs/cloud/openstack/config.sh
@@ -0,0 +1 @@
+ BUILDROOT_DEFAULT="openstack-macros bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed unzip util-linux-ng git which buildsys-tools xz"