Chore: Upgrade Jenkins-job-builder to 6.3.0

[releng/global-jjb.git] / shell / sigul-install.sh

diff --git a/shell/sigul-install.sh b/shell/sigul-install.sh
old mode 100644 (file)
new mode 100755 (executable)
index 71db786..08b3b7d
--- a/shell/sigul-install.sh
+++ b/shell/sigul-install.sh
@@ -11,31 +11,24 @@
 echo "---> sigul-install.sh"
 
 # Ensure we fail the job if any steps fail.
-set -eu -o pipefail
+set -e -o pipefail
 
-# Setup sigul RPM repo
-echo "[fedora-infra-sigul]
+if command -v sigul &>/dev/null; then
+    echo "Sigul already installed; skipping installation."
+else
+    # Setup sigul RPM repo
+    echo "[fedora-infra-sigul]
 name=Fedora builder packages for sigul
-baseurl=https://infrastructure.fedoraproject.org/repo/infra/epel\$releasever-infra/\$basearch/
+baseurl=https://kojipkgs.fedoraproject.org/repos-dist/epel\$releasever-infra/latest/\$basearch/
 enabled=1
 gpgcheck=1
 gpgkey=https://infrastructure.fedoraproject.org/repo/infra/RPM-GPG-KEY-INFRA-TAGS
 includepkgs=sigul*
 skip_if_unavailable=True" > fedora-infra-sigul.repo
 
-sudo cp fedora-infra-sigul.repo /etc/yum.repos.d
-rm fedora-infra-sigul.repo
+    sudo cp fedora-infra-sigul.repo /etc/yum.repos.d
+    rm fedora-infra-sigul.repo
 
-# install sigul
-sudo yum install -y -q sigul
-
-# configure /etc/hosts with the sigul bridge hostname
-# This is needed as build minions can't always get DNS resolution
-# on the bridge
-BRIDGE_HOST=$(grep bridge-hostname "$SIGUL_CONFIG" | awk '{print $2}')
-
-# SIGUL_BRIDGE_IP must be defined as a Jenkins env variable
-cp /etc/hosts hosts
-echo -e "$SIGUL_BRIDGE_IP\t$BRIDGE_HOST" >> hosts
-sudo cp hosts /etc/hosts
-rm hosts
+    # install sigul
+    sudo yum install -y -q sigul
+fi;