Commit bd3036ad authored by Andrea Sciaba's avatar Andrea Sciaba
Browse files

Moved to new versions of RHL6/7 singularity images

parent 911407ec
#!/bin/sh
# default image
export OSG_SINGULARITY_IMAGE_DEFAULT="/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6-m202001"
export OSG_SINGULARITY_IMAGE_DEFAULT="/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6"
# for now, we will only advertise singularity on nodes which can access cvmfs
if [ ! -e "$OSG_SINGULARITY_IMAGE_DEFAULT" ]; then
......
......@@ -14,8 +14,8 @@ export SAME_CRITICAL=60
export SAME_MAINTENANCE=100
# setup grid client software
rhel6_img='/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6-m202001'
rhel7_img='/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel7-m202001'
rhel6_img='/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6'
rhel7_img='/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel7'
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'
......
#!/bin/sh
# default image
export OSG_SINGULARITY_IMAGE_DEFAULT="/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6-m202001"
export OSG_SINGULARITY_IMAGE_DEFAULT="/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6"
# Useful Information in case of a problem:
echo "System: `/bin/uname -a`"
......
#!/bin/sh
# default image
export OSG_SINGULARITY_IMAGE_DEFAULT="/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6"
# for now, we will only advertise singularity on nodes which can access cvmfs
if [ ! -e "$OSG_SINGULARITY_IMAGE_DEFAULT" ]; then
echo "ERROR: cannot find default singularity image under CVMFS"
echo "summary: SINGULARITY_CVMFS_IMAGE_NOT_FOUND"
exit $SAME_ERROR
fi
source ${SAME_SENSOR_HOME}/tests/singularity_lib.sh
# some known singularity locations
for LOCATION in \
/util/opt/singularity/2.2.1/gcc/4.4/bin \
......@@ -12,26 +24,17 @@ for LOCATION in \
fi
done
export PATH
HAS_SINGULARITY="False"
export OSG_SINGULARITY_VERSION=`singularity --version 2>/dev/null`
if [ "x$OSG_SINGULARITY_VERSION" != "x" ]; then
HAS_SINGULARITY="True"
export OSG_SINGULARITY_PATH=`which singularity`
else
# some sites requires us to do a module load first - not sure if we always want to do that
export OSG_SINGULARITY_VERSION=`module load singularity >/dev/null 2>&1; singularity --version 2>/dev/null`
if [ "x$OSG_SINGULARITY_VERSION" != "x" ]; then
HAS_SINGULARITY="True"
export OSG_SINGULARITY_PATH=`module load singularity >/dev/null 2>&1; which singularity`
fi
fi
# default image for this glidein
export OSG_SINGULARITY_IMAGE_DEFAULT="/cvmfs/singularity.opensciencegrid.org/bbockelm/cms:rhel6"
SINGULARITY_BIN=${SINGULARITY_BIN:-""}
singularity_locate_bin "$SINGULARITY_BIN" $OSG_SINGULARITY_IMAGE_DEFAULT
# for now, we will only advertise singularity on nodes which can access cvmfs
if [ ! -e "$OSG_SINGULARITY_IMAGE_DEFAULT" ]; then
HAS_SINGULARITY="False"
if [ "$HAS_SINGULARITY" == "False" ] ; then
echo 'ERROR: Singularity not found!'
echo 'summary: SINGULARITY_NOT_FOUND'
exit $SAME_ERROR
else
echo "OSG_SINGULARITY_VERSION = ${GWMS_SINGULARITY_VERSION}"
echo "OSG_SINGULARITY_PATH = ${GWMS_SINGULARITY_PATH}"
fi
# Let's do a simple singularity test by echoing something inside, and then
......@@ -40,8 +43,8 @@ fi
# ERROR : Could not identify basedir for home directory path: /
if [ "x$HAS_SINGULARITY" = "xTrue" ]; then
SINGULARITY_HOME=`mktemp -d`
echo "$OSG_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv --bind /cvmfs --pwd /srv --contain --ipc --pid $OSG_SINGULARITY_IMAGE_DEFAULT echo Hello World | grep Hello World"
if ! ($OSG_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv \
echo "$GWMS_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv --bind /cvmfs --pwd /srv --contain --ipc --pid $OSG_SINGULARITY_IMAGE_DEFAULT echo \"Hello World\" | grep \"Hello World\""
if ! ($GWMS_SINGULARITY_PATH exec --home $SINGULARITY_HOME:/srv \
--bind /cvmfs \
--pwd /srv \
--contain --ipc --pid \
......
Markdown is supported
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