Merge pull request #323 from Azure/pbsclient-fix

Update pbsclient.sh

pyazhpc/azinstall.py

@@ -44,7 +44,13 @@ done
 if [ "$1" != "" ]; then
     tag=tags/$1
 else
-    sudo yum install -y epel-release > {logfile} 2>&1
+    while ! rpm -q epel-release
+    do
+        if ! sudo yum install -y epel-release > {logfile} 2>&1
+        then
+            sudo yum clean metadata
+        fi
+    done
     sudo yum install -y pssh nc >> {logfile} 2>&1
 
     # setting up keys

scripts/cndefault.sh

@@ -1,8 +1,13 @@
 #!/bin/bash
+
 # Script to be run on all compute nodes
-if ! rpm -q epel-release; then
-    yum -y install epel-release
-fi
+while ! rpm -q epel-release
+do
+    if ! yum -y install epel-release
+    then
+        yum clean metadata
+    fi
+done
 
 yum -y install git jq htop
 

scripts/pbsclient.sh

@@ -1,9 +1,11 @@
 #!/bin/bash
 set -e
+
 # arg: $1 = pbs_server
 pbs_server=$1
 
 if [ "$(rpm -qa pbspro-execution)" = "" ];then
+    yum install -y jq
     yum install -y pbspro-execution-19.1.1-0.x86_64.rpm
 
     sed -i "s/CHANGE_THIS_TO_PBS_PRO_SERVER_HOSTNAME/${pbs_server}/g" /etc/pbs.conf

scripts/pbsserver.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+
 admin_user=$(whoami)
 
 if [ "$(rpm -qa pbspro-server)" = "" ];then