Commit 8822ac6a authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Minor fixes to xrootd tests

parent a605e7ea
#!/bin/sh
# Choose CMSSW version
cmsswvsn=CMSSW_9_0_0
cmsswvsn=CMSSW_9_2_6
# Check that scramv1 command was defined by . $CMS_PATH/cmsset_default.sh
which scramv1 > /dev/null 2>&1
......
......@@ -330,7 +330,7 @@ def main():
return print_summary("Failure to create test directory 'xrootd-access': %s." % str(oe), returnCode)
os.chdir("xrootd-access")
cmssw_version="CMSSW_9_0_0"
cmssw_version="CMSSW_9_2_6"
stdout, exitCode = runCommand("scramv1", ["-a", scram_arch, "p", "CMSSW", cmssw_version], opts, combineStd=True)
if stdout.strip():
log.info("scramv1 p CMSSW %s output:" % cmssw_version)
......
......@@ -14,6 +14,7 @@ import optparse
import shutil
from distutils.spawn import find_executable
import xml.etree.ElementTree as ET
import random
# ########################################################################### #
......@@ -216,9 +217,6 @@ def main():
NAG_WARNING = getExitCode("SAME_WARNING", 40)
NAG_OK = getExitCode("SAME_OK", 10)
# Default to successful job
exitcode = NAG_OK
now = time.strftime("%x %X", time.gmtime())
currdir = os.path.abspath(os.curdir)
host = socket.gethostname()
......@@ -326,8 +324,8 @@ def main():
siteName = siteinfo.get('name')
log.info("Site name: %s" % siteName)
for event in siteinfo.findall('event-data'):
for catalog in event.findall('catalog'):
numCatalogs = numCatalogs + 1
for catalog in event.findall('catalog'):
numCatalogs = numCatalogs + 1
fd.close()
if numCatalogs == 1:
log.info("Only 1 catalog line in site-local-config.xml file -- may be wrong configuration.")
......@@ -353,7 +351,7 @@ def main():
return print_summary("Failure to create test directory 'xrootd-fallback': %s." % str(oe), NAG_CRITICAL)
os.chdir("xrootd-fallback")
cmssw_version="CMSSW_9_0_0"
cmssw_version="CMSSW_9_2_6"
stdout, exitCode = runCommand("scramv1", ["-a", scram_arch, "p", "CMSSW", cmssw_version], opts, combineStd=True)
if stdout.strip():
log.info("scramv1 p CMSSW %s output:" % cmssw_version)
......@@ -382,7 +380,7 @@ def main():
no_trial += 1
for line in stdout.split('\n'):
if re.search('opened', line) or re.search('redirect', line):
print line
print line
maxlen = 12*1024
if opts.verbose:
......@@ -402,7 +400,6 @@ def main():
log.info("retrying with fallback site: %s" % CSWNFB_SITES[rndm_site])
if exitCode:
log.error("Failed cmsRun. Output:")
returnCode = NAG_CRITICAL
if numCatalogs > 1: # Fallback correctly configured, so only WARN
returnCode = NAG_WARNING
......@@ -410,13 +407,8 @@ def main():
log.info("Successful cmsRun.")
# Return the correct exit code.
if exitCode != NAG_OK:
log.info("Output:")
print stdout
log.warning("Execution contains warnings")
else:
log.info("Success!")
return exitCode
log.info("Success!")
return NAG_OK
if __name__ == '__main__':
sys.exit(main())
......
......@@ -4,7 +4,7 @@
Summary: WLCG Compliant Probes from %{site}
Name: nagios-plugins-wlcg-org.cms
Version: 1.1.53
Version: 1.1.54
Release: 1%{?dist}
License: GPL
......@@ -52,6 +52,8 @@ install --directory %{buildroot}/etc/cron.d
/etc/cron.d/cms_glexec
%changelog
* Thu Dec 6 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
* Fri Jul 20 2018 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.52-1.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment