smedev/smeserver-koji
6
0
Fork 0
mirror of https://src.koozali.org/infra/smeserver-koji.git synced 2024-11-21 17:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

move add required programs eralier

Browse Source
This commit is contained in:
Trevor Batley 2024-03-03 18:11:00 +11:00
parent 7ed09719e7
commit 9df10494ad
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
koji-setup/koji-add-builder.sh
View File

@ -36,6 +36,14 @@ if [ -z $KOJI_BUILD_FQDN ] ; then
KOJI_BUILD_FQDN=$KOJI_HUB_FQDN KOJI_BUILD_FQDN=$KOJI_HUB_FQDN
fi fi
# install any required packages
if [[ -z $(dnf list installed | grep epel-release) ]] ; then
dnf install -y epel-release $QUIET
fi
if [[ -z $(dnf list installed | grep netcat) ]] ; then
dnf install -y netcat $QUIET
fi
# check that the target exists # check that the target exists
RESP=$(nc -z $KOJI_BUILD_FQDN 22 2>&1 | grep succeeded) RESP=$(nc -z $KOJI_BUILD_FQDN 22 2>&1 | grep succeeded)
if [[ -z $RESP ]] ; then if [[ -z $RESP ]] ; then
@ -46,14 +54,6 @@ if [[ -z $RESP ]] ; then
exit 1 exit 1
fi fi
# install any required packages
if [[ -z $(dnf list installed | grep epel-release) ]] ; then
dnf install -y epel-release $QUIET
fi
if [[ -z $(dnf list installed | grep netcat) ]] ; then
dnf install -y netcat $QUIET
fi
## On the HUB ## On the HUB
# Add the host entry for the koji builder to the database # Add the host entry for the koji builder to the database
sudo -u kojiadmin koji add-host "$KOJI_BUILD_FQDN" "$RPM_ARCH" sudo -u kojiadmin koji add-host "$KOJI_BUILD_FQDN" "$RPM_ARCH"
@ -77,7 +77,7 @@ if [[ $KOJI_BUILD_FQDN = $KOJI_HUB_FQDN ]] ; then
curl $SILENT $SCRIPT_GIT/koji-deploy-builder.sh > $SCRIPT_DIR/koji-deploy-builder.sh curl $SILENT $SCRIPT_GIT/koji-deploy-builder.sh > $SCRIPT_DIR/koji-deploy-builder.sh
chmod o+x $SCRIPT_DIR/koji-deploy-builder.sh chmod o+x $SCRIPT_DIR/koji-deploy-builder.sh
fi fi
koji-deploy-builder.sh $DEBUG $SCRIPT_DIR/koji-deploy-builder.sh $DEBUG
else else
# deploy to specified server # deploy to specified server
@ -87,7 +87,7 @@ else
# add nfs share for koji files direcory to hub # add nfs share for koji files direcory to hub
curl $SILENT $SCRIPT_GIT/koji-deploy-nfs-server.sh > $SCRIPT_DIR/koji-deploy-nfs-server.sh curl $SILENT $SCRIPT_GIT/koji-deploy-nfs-server.sh > $SCRIPT_DIR/koji-deploy-nfs-server.sh
chmod o+x $SCRIPT_DIR/koji-deploy-nfs-server.sh chmod o+x $SCRIPT_DIR/koji-deploy-nfs-server.sh
koji-deploy-nfs-server.sh $DEBUG $SCRIPT_DIR/koji-deploy-nfs-server.sh $DEBUG
fi fi
# add build server to nfs exports line for /mnt/koji # add build server to nfs exports line for /mnt/koji