Merge pull request #175 from trz42/adjustments-for-eessi-bot

tweak scripts to make them a bit more flexible (so they can be leveraged by software-layer bot)

Author: boegel

build_container.sh

@@ -50,7 +50,10 @@ else
     export SINGULARITY_BIND="$SINGULARITY_BIND,$BIND_PATHS"
 fi
 
-export SINGULARITY_HOME="$EESSI_TMPDIR/home:/home/$USER"
+# allow that SINGULARITY_HOME is defined before script is run
+if [ -z $SINGULARITY_HOME ]; then
+    export SINGULARITY_HOME="$EESSI_TMPDIR/home:/home/$USER"
+fi
 
 # set environment variables for fuse mounts in Singularity container
 export EESSI_PILOT_READONLY="container:cvmfs2 pilot.eessi-hpc.org /cvmfs_ro/pilot.eessi-hpc.org"

configure_easybuild

@@ -14,7 +14,9 @@ export EASYBUILD_ZIP_LOGS=bzip2
 export EASYBUILD_RPATH=1
 export EASYBUILD_FILTER_ENV_VARS=LD_LIBRARY_PATH
 
-export EASYBUILD_HOOKS=$(realpath eb_hooks.py)
+# assume that eb_hooks.py is located in same directory as this script (configure_easybuild)
+TOPDIR=$(dirname $(realpath $BASH_SOURCE))
+export EASYBUILD_HOOKS=$(realpath ${TOPDIR}/eb_hooks.py)
 # make sure hooks are available, so we can produce a clear error message
 if [ ! -f $EASYBUILD_HOOKS ]; then
     fatal_error "$EASYBUILD_HOOKS does not exist!"

init/minimal_eessi_env

@@ -1,7 +1,7 @@
 # define minimal EESSI environment, without relying on external scripts
 
 export EESSI_CVMFS_REPO="/cvmfs/pilot.eessi-hpc.org"
-export EESSI_PILOT_VERSION="2021.12"
+export EESSI_PILOT_VERSION="${EESSI_PILOT_VERSION_OVERRIDE:=2021.12}"
 export EESSI_PREFIX=$EESSI_CVMFS_REPO/versions/$EESSI_PILOT_VERSION
 
 if [[ $(uname -s) == 'Linux' ]]; then