minir bug fixes

This commit is contained in:
Trevor Batley 2023-09-02 15:39:30 +10:00
parent b1b9d15934
commit d3fd961e2f

View File

@ -33,7 +33,11 @@ curl $SILENT $SCRIPT_GIT/deploy-koji.sh > $SCRIPT_DIR/deploy-koji.sh
curl $SILENT $SCRIPT_GIT/bootstrap-build.sh > $SCRIPT_DIR/bootstrap-build.sh curl $SILENT $SCRIPT_GIT/bootstrap-build.sh > $SCRIPT_DIR/bootstrap-build.sh
chmod o+x $SCRIPT_DIR/*.sh chmod o+x $SCRIPT_DIR/*.sh
# install any required packages
dnf install -y netcat $QUIET
# ask for required parameters (ssh settings and build server FQDN) # ask for required parameters (ssh settings and build server FQDN)
KOJID_CAPACITY=16
KOJI_HUB_FQDN="$(hostname -f)" KOJI_HUB_FQDN="$(hostname -f)"
while true ; do while true ; do
read -p "Country Code (eg, US) " COUNTRY_CODE read -p "Country Code (eg, US) " COUNTRY_CODE
@ -80,9 +84,8 @@ cat > $SCRIPT_DIR/parameters.sh <<- EOT
## KOJI RPM BUILD AND TRACKER ## KOJI RPM BUILD AND TRACKER
export KOJI_DIR=/mnt/koji export KOJI_DIR=/mnt/koji
export KOJI_HUB_FQDN="$KOJI_HUB_FQDN" export KOJI_HUB_FQDN="$KOJI_HUB_FQDN"
export KOJI_BUILD_FQDN="$KOJI_BUILD_FQDN"
export KOJI_URL=http://"$KOJI_HUB_FQDN" export KOJI_URL=http://"$KOJI_HUB_FQDN"
export KOJID_CAPACITY=16 export KOJID_CAPACITY=$KOJID_CAPACITY
export TAG_NAME=sme export TAG_NAME=sme
# Use for koji SSL certificates # Use for koji SSL certificates
export COUNTRY_CODE='$COUNTRY_CODE' export COUNTRY_CODE='$COUNTRY_CODE'
@ -141,11 +144,13 @@ while true ; do
;; ;;
IP=* ) IP=* )
BIP=${RESPONSE#*=} BIP=${RESPONSE#*=}
# add this builder into the hosts file
echo "$BIP $KOJI_BUILD_FQDN\n" >> /etc/hosts echo "$BIP $KOJI_BUILD_FQDN\n" >> /etc/hosts
continue continue
;; ;;
FQDN=* ) FQDN=* )
KOJI_BUILD_FQDN=${RESPONSE#*=} KOJI_BUILD_FQDN=${RESPONSE#*=}
continue
;; ;;
*) *)
continue continue
@ -204,7 +209,7 @@ while true ; do
ssh $QUIET root@$KOJI_BUILD_FQDN $SCRIPT_DIR/deploy-koji-nfs-client.sh ssh $QUIET root@$KOJI_BUILD_FQDN $SCRIPT_DIR/deploy-koji-nfs-client.sh
# deploy koji builder # deploy koji builder
ssh $QUIET root@$KOJI_BUILD_FQDN $SCRIPT_DIR/deploy-koji-builder.sh ssh $QUIET root@$KOJI_BUILD_FQDN $SCRIPT_DIR/deploy-koji-builder.sh
fi done
# #
bootstrap-build.sh bootstrap-build.sh