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
a5477283
Commit
a5477283
authored
May 14, 2020
by
Andrea Sciaba
Browse files
Moved to new singularity search algorithm
parent
5c0db4d8
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
SiteTests/testjob/tests/CE-cms-singularity-runner
View file @
a5477283
...
...
@@ -14,8 +14,8 @@ export SAME_CRITICAL=60
export
SAME_MAINTENANCE
=
100
# setup grid client software
rhel6_img
=
'/cvmfs/singularity.opensciencegrid.org/
bbockelm
/cms:rhel6'
rhel7_img
=
'/cvmfs/singularity.opensciencegrid.org/
bbockelm
/cms:rhel7'
rhel6_img
=
'/cvmfs/singularity.opensciencegrid.org/
cmssw
/cms:rhel6
-m202001
'
rhel7_img
=
'/cvmfs/singularity.opensciencegrid.org/
cmssw
/cms:rhel7
-m202001
'
rhel6_client
=
'/cvmfs/oasis.opensciencegrid.org/osg-software/osg-wn-client/3.4/current/el6-x86_64/setup.sh'
rhel7_client
=
'/cvmfs/oasis.opensciencegrid.org/osg-software/osg-wn-client/3.4/current/el7-x86_64/setup.sh'
...
...
SiteTests/testjob/tests/CE-cms-singularity-wrapper
View file @
a5477283
#!/bin/sh
# default image
export
OSG_SINGULARITY_IMAGE_DEFAULT
=
"/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6-m202001"
# Useful Information in case of a problem:
echo
"System:
`
/bin/uname
-a
`
"
echo
"Current working directory:
`
/bin/pwd
`
"
...
...
@@ -9,6 +12,8 @@ echo "SAME_SENSOR_HOME = ${SAME_SENSOR_HOME}"
echo
"PATH =
${
PATH
}
"
/bin/ls
-l
/cvmfs/cms.cern.ch/SITECONF/local
||
true
source
${
SAME_SENSOR_HOME
}
/tests/singularity_lib.sh
echo
"Unsetting SCRAM_ARCH..."
unset
SCRAM_ARCH
...
...
@@ -27,29 +32,8 @@ for LOCATION in \
fi
done
export
PATH
HAS_SINGULARITY
=
"True"
export
OSG_SINGULARITY_VERSION
=
`
singularity
--version
2>/dev/null
`
if
[
"x
$OSG_SINGULARITY_VERSION
"
!=
"x"
]
;
then
export
OSG_SINGULARITY_PATH
=
`
which singularity
`
else
# some sites need us to do a module load first
export
OSG_SINGULARITY_VERSION
=
`
module load singularity
>
/dev/null 2>&1
;
singularity
--version
2>/dev/null
`
if
[
"x
$OSG_SINGULARITY_VERSION
"
!=
"x"
]
;
then
export
OSG_SINGULARITY_PATH
=
`
module load singularity
>
/dev/null 2>&1
;
which singularity
`
else
HAS_SINGULARITY
=
'False'
echo
"WARNING: Could not find singularity on system"
fi
fi
# default image for this glidein
export
OSG_SINGULARITY_IMAGE_DEFAULT
=
"/cvmfs/singularity.opensciencegrid.org/bbockelm/cms:rhel6"
# for now, we will only advertise singularity on nodes which can access cvmfs
if
[
!
-e
"
$OSG_SINGULARITY_IMAGE_DEFAULT
"
]
;
then
HAS_SINGULARITY
=
'False'
echo
"WARNING: Could not find singularity image on system"
fi
singularity_locate_bin /usr/bin
$OSG_SINGULARITY_IMAGE_DEFAULT
# Grid environment is taken from OSG, check it's available:
if
[
!
-e
/cvmfs/oasis.opensciencegrid.org/osg-software/osg-wn-client
]
;
then
...
...
@@ -62,8 +46,8 @@ if [ "$HAS_SINGULARITY" == "False" ] ; then
echo
'summary: SINGULARITY_NOT_FOUND'
exit
$SAME_ERROR
else
echo
"OSG_SINGULARITY_VERSION =
${
OSG
_SINGULARITY_VERSION
}
"
echo
"OSG_SINGULARITY_PATH =
${
OSG
_SINGULARITY_PATH
}
"
echo
"OSG_SINGULARITY_VERSION =
${
GWMS
_SINGULARITY_VERSION
}
"
echo
"OSG_SINGULARITY_PATH =
${
GWMS
_SINGULARITY_PATH
}
"
fi
OSG_SINGULARITY_EXTRA_OPTS
=
"--home
${
SAME_SENSOR_HOME
}
:/srv --bind /cvmfs --contain"
...
...
@@ -86,7 +70,7 @@ fi
export
X509_USER_PROXY
=
/srv/proxy.pem
cd
/cvmfs/singularity.opensciencegrid.org
$
OSG
_SINGULARITY_PATH
exec
$OSG_SINGULARITY_EXTRA_OPTS
\
$
GWMS
_SINGULARITY_PATH
exec
$OSG_SINGULARITY_EXTRA_OPTS
\
--pwd
/srv
\
--ipc
--pid
\
"
$OSG_SINGULARITY_IMAGE_DEFAULT
"
\
...
...
SiteTests/testjob/tests/singularity_lib.sh
0 → 100644
View file @
a5477283
This diff is collapsed.
Click to expand it.
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