Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
etf
cmssam
Commits
e6429758
Commit
e6429758
authored
Apr 15, 2019
by
Andrea Sciaba
Browse files
Merge branch 'master' into qa
parents
cd9c3e50
1509f088
Changes
5
Hide whitespace changes
Inline
Side-by-side
SiteTests/FroNtier/tests/CE-cms-squid
View file @
e6429758
...
...
@@ -2,7 +2,7 @@
shopt
-s
expand_aliases
SCRIPT_REVISION
=
"2019-03-05, Dave Dykstra and Edita Kizinevi
č
"
SCRIPT_REVISION
=
"2019-03-05, Dave Dykstra and Edita Kizinevi
c
"
# Source the CMS environment
if
[
-n
"
$OSG_GRID
"
]
;
then
...
...
@@ -166,4 +166,4 @@ if $ever_failed ; then
else
echo
"Proxy test is OK"
exit
$SAME_OK
fi
\ No newline at end of file
fi
SiteTests/MonteCarlo/tests/CE-cms-mc
View file @
e6429758
...
...
@@ -5,7 +5,6 @@ date
# Source the CMS environment
if
[
-n
"
$OSG_GRID
"
]
;
then
which gfal-copy
>
/dev/null 2> /dev/null
||
([
-f
$OSG_GRID
/setup.sh
]
&&
source
$OSG_GRID
/setup.sh
)
if
[
-d
$OSG_APP
/cmssoft/cms
]
;
then
SW_DIR
=
$OSG_APP
/cmssoft/cms
elif
[
-d
$CVMFS
/cms.cern.ch
]
;
then
...
...
SiteTests/testjob/tests/CE-cms-remotestageout
View file @
e6429758
...
...
@@ -2,24 +2,7 @@
# Source the CMS environment
#export SCRAM_ARCH=slc6_amd64_gcc493
if
[
-n
"
$OSG_GRID
"
]
;
then
[
-f
$OSG_GRID
/setup.sh
]
&&
source
$OSG_GRID
/setup.sh
if
[
-d
$OSG_APP
/cmssoft/cms
]
;
then
SW_DIR
=
$OSG_APP
/cmssoft/cms
elif
[
-d
$CVMFS
/cms.cern.ch
]
;
then
SW_DIR
=
$CVMFS
/cms.cern.ch
elif
[
-d
/cvmfs/cms.cern.ch
]
;
then
SW_DIR
=
/cvmfs/cms.cern.ch
else
echo
"ERROR: Cannot find CMS software in OSG node"
echo
"summary: SW_DIR_UNDEF"
exit
$SAME_ERROR
fi
elif
[
-n
"
$VO_CMS_SW_DIR
"
]
;
then
SW_DIR
=
$VO_CMS_SW_DIR
else
SW_DIR
=
/cvmfs/cms.cern.ch
fi
SW_DIR
=
/cvmfs/cms.cern.ch
tmpfile
=
`
mktemp
/tmp/tmp.XXXXXXXXXX
`
source
$SW_DIR
/cmsset_default.sh
>
$tmpfile
2>&1
...
...
@@ -35,7 +18,7 @@ fi
rm
-f
$tmpfile
arch
=
`
cmsos
`
echo
"arch:
$arch
"
echo
"
scram_
arch:
$arch
"
# Source libraries required by WMCore
if
[[
$arch
==
slc6
*
]]
;
then
...
...
nagios/config/org.cms.lcgadmin/etc/wn.d/org.cms/services.cfg
View file @
e6429758
...
...
@@ -67,7 +67,7 @@ define service {
define service {
use sam-generic-wn-active
service_description org.cms.WN-squid-<VOMS>
check_command samtest-run-sensor!CE-cms-squid
check_command samtest-run-sensor!CE-cms-squid
.sing
}
define service {
use sam-generic-wn-active
...
...
nagios/grid-monitoring-probes-org.cms-etf.spec
View file @
e6429758
...
...
@@ -4,7 +4,7 @@
Summary: WLCG Compliant Probes from %{site}
Name: nagios-plugins-wlcg-org.cms
Version: 1.1.5
6
Version: 1.1.5
8
Release: 1%{?dist}
License: GPL
...
...
@@ -52,8 +52,13 @@ install --directory %{buildroot}/etc/cron.d
/etc/cron.d/cms_glexec
%changelog
* Mon Apr 15 2019 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.58-1.
- Fixed environment problems in remotestageout and mc test
- Fixed mysterious problem in squid test preventing it to finish
* Fri Apr 5 2019 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.57-1.
- Fixed SCRAM_ARCH conflict with Singularity; new squid test
* Fri Feb 22 2019 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.56-1.
*
Improved timeout logic to xrootd-fallback
-
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 2018 Andrea Sciaba <Andrea.Sciaba@cern.ch> 1.1.54-1.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment