jobsub_lite should default to fnal_wn SL7 singularity container

[shreyb]

jobsub_lite should default to fnal_wn SL7 singularity container

[shreyb]

Finished code changes. Will test, then submit PR.

[shreyb]

Testing passed. Ready to open PR.

Ran test with new code, and it worked:

Tests

Run with no singularity image specified

Expected outcome: use default singularity image (/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.6)

$ ./jobsub_lite/bin/jobsub_submit -G mu2e   --resource-provides=usage_model=DEDICATED,OPPORTUNISTIC,OFFSITE --devserver file:///home/sbhat/TestJobs/test_env.sh

...after job ran:

$ grep SINGULARITY *.out
[FERMIHTC-SINGULARITY]: INFO -- SingularityImage classAd detected
[FERMIHTC-SINGULARITY]: INFO -- Attempting to run job in /cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.6
[FERMIHTC-SINGULARITY]: INFO -- Running /usr/bin/singularity exec --pid --ipc --contain --bind /cvmfs --bind /etc/hosts --home /storage/local/data1/condor/execute/dir_10427:/srv --pwd /srv /cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.6 ./condor_exec.exe
SINGULARITY_APPNAME=
FERMIHTC_SINGULARITY_PWD=/srv
FERMIHTC_SINGULARITY_ARGS=--pid --ipc --contain
SINGULARITY_NAME=fnal-wn-sl7:osg3.6
FERMIHTC_SINGULARITY_BIND=/cvmfs /etc/hosts
FERMIHTC_SINGULARITY_CMD=exec
FERMIHTC_SINGULARITY_BIN=/usr/bin/singularity
SINGULARITY_CONTAINER=/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.6

Pass.

Run with --no-singularity

Expected outcome: Job should run on bare metal (or if on Fermigrid or other similar site, in Docker container, but not singularity)

$ ./jobsub_lite/bin/jobsub_submit -G mu2e   --resource-provides=usage_model=DEDICATED,OPPORTUNISTIC,OFFSITE --no-singularity --devserver file:///home/sbhat/TestJobs/test_env.sh

...after job ran:

$ grep SINGULARITY *.out
[FERMIHTC-SINGULARITY]: INFO -- No Singulariy image specified
[FERMIHTC-SINGULARITY]: INFO -- Running job on the host machine
[FERMIHTC-SINGULARITY]: INFO -- Running ./condor_exec.exe
FERMIHTC_SINGULARITY_PWD=/srv
FERMIHTC_SINGULARITY_ARGS=--pid --ipc --contain
FERMIHTC_SINGULARITY_BIND=/cvmfs /etc/hosts
FERMIHTC_SINGULARITY_CMD=exec
FERMIHTC_SINGULARITY_BIN=/usr/bin/singularity

Pass.

Run with non-default singularity image specified

Expected outcome: Job should run in specified singularity image (/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.5)

$ ./jobsub_lite/bin/jobsub_submit -G mu2e   --resource-provides=usage_model=DEDICATED,OPPORTUNISTIC,OFFSITE --singularity-image="/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.5"  --devserver file:///home/sbhat/TestJobs/test_env.sh

...after job ran:

$ grep SINGULARITY *.out
[FERMIHTC-SINGULARITY]: INFO -- SingularityImage classAd detected
[FERMIHTC-SINGULARITY]: INFO -- Attempting to run job in /cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.5
[FERMIHTC-SINGULARITY]: INFO -- Running /usr/bin/singularity exec --pid --ipc --contain --bind /cvmfs --bind /etc/hosts --home /storage/local/data1/condor/execute/dir_2074:/srv --pwd /srv /cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.5 ./condor_exec.exe
SINGULARITY_APPNAME=
FERMIHTC_SINGULARITY_PWD=/srv
FERMIHTC_SINGULARITY_ARGS=--pid --ipc --contain
SINGULARITY_NAME=fnal-wn-sl7:osg3.5
FERMIHTC_SINGULARITY_BIND=/cvmfs /etc/hosts
FERMIHTC_SINGULARITY_CMD=exec
FERMIHTC_SINGULARITY_BIN=/usr/bin/singularity
SINGULARITY_CONTAINER=/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:osg3.5

Pass.

Run with latest-tagged singularity image specified

Note: This is kind of a repeat of the last test, but how we want to run in production

Expected outcome: Job should run in specified singularity container (/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest)

$ ./jobsub_lite/bin/jobsub_submit -G mu2e   --resource-provides=usage_model=DEDICATED,OPPORTUNISTIC,OFFSITE --singularity-image="/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest"  --devserver file:///home/sbhat/TestJobs/test_env.sh

...after job ran:

$ grep SINGULARITY *.out
[FERMIHTC-SINGULARITY]: INFO -- SingularityImage classAd detected
[FERMIHTC-SINGULARITY]: INFO -- Attempting to run job in /cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest
[FERMIHTC-SINGULARITY]: INFO -- Running /usr/bin/singularity exec --pid --ipc --contain --bind /cvmfs --bind /etc/hosts --home /storage/local/data1/condor/execute/dir_2075:/srv --pwd /srv /cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest ./condor_exec.exe
SINGULARITY_APPNAME=
FERMIHTC_SINGULARITY_PWD=/srv
FERMIHTC_SINGULARITY_ARGS=--pid --ipc --contain
SINGULARITY_NAME=fnal-wn-sl7:latest
FERMIHTC_SINGULARITY_BIND=/cvmfs /etc/hosts
FERMIHTC_SINGULARITY_CMD=exec
FERMIHTC_SINGULARITY_BIN=/usr/bin/singularity
SINGULARITY_CONTAINER=/cvmfs/singularity.opensciencegrid.org/fermilab/fnal-wn-sl7:latest

Pass.