Merge branch 'master' into qa

SiteTests/testjob/tests/CE-cms-env

@@ -38,14 +38,14 @@ function check_df {
 function check_quota {
     dir=$1
     fs=`df -kP $dir | awk '{if (NR==2) print $1}'`
-    myquotastr=`quota 2>/dev/null | awk '{if (NR>2) {if (NF==1) {n=$1; getline; print n " " $2-$1} else {print $1 " " $3-$2}}}' |grep $fs`
+    myquotastr=`timeout 15 quota 2>/dev/null | awk '{if (NR>2) {if (NF==1) {n=$1; getline; print n " " $2-$1} else {print $1 " " $3-$2}}}' |grep $fs`
     if [ $? -eq 0 ]; then
 	# check only if there are any quotas, else ignore
 	myquota=`echo $myquotastr|awk '{print $2}'`
 	let "quotagb=$myquota / (2 * 1000)"
-	echo $quotagb
-    fi
+    else
         echo -1
+    fi
     return 0
 }
 
@@ -109,7 +109,6 @@ rm -rf $local_proxy_dir
 type -t voms-proxy-info > /dev/null
 result=$?
 if [ $result -eq 0 ] ; then
-    isvoms=1
     echo -n "UserDN: "
     voms-proxy-info -identity
     l=`voms-proxy-info -timeleft`
@@ -117,13 +116,12 @@ if [ $result -eq 0 ] ; then
     fqan=`voms-proxy-info -fqan`
     echo "FQAN:"
     echo "$fqan"
+    if [ $l -lt 21600 ] ; then
+        echo "WARNING: proxy shorther than 6 hours"
+    fi
 else
-    isvoms=0
     echo "WARNING: voms-proxy-info not found"
 fi
-if [ $isvoms -eq 1 -a $l -lt 21600 ] ; then
-    echo "WARNING: proxy shorther than 6 hours"
-fi    
 
 # Test of the local worker node environment
 echo

nagios/grid-monitoring-probes-org.cms-etf.spec

@@ -4,7 +4,7 @@
 
 Summary: WLCG Compliant Probes from %{site}
 Name: nagios-plugins-wlcg-org.cms
-Version: 1.1.55
+Version: 1.1.56
 Release: 1%{?dist}
 
 License: GPL
@@ -52,9 +52,11 @@ install --directory %{buildroot}/etc/cron.d
 /etc/cron.d/cms_glexec
 
 %changelog
-* Fri Feb 1 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.55-1.
+* Fri Feb 22 2019 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.56-1.
+* Improved timeout logic to xrootd-fallback
+* Fri Feb 1 2019 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.55-1.
 - Made xrootd fallback test critical
-* Thu Dec 6 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.54-1.
+* Thu Dec 6 2018 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.54-1.
 - fixes in xrootd-fallback and moved CMSSW to CMSSW_9_2_6 in tests
 * Tue Nov 6 2018 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.53-1.
 - fixes in xrootd-fallback, remotestageout, mc and SRM tests