Merge remote-tracking branch 'origin/master' into D2_takumi

platforms/common/spack_utils.sh

 function _install_spack() {
   if [ ! -e ${SPACK_ROOT} ]; then
+    if ! command -v git &> /dev/null
+    then
+      echo "git could not be found ... will try to load it form the module system ..."
+      module load git || echo "could not load git from module system"
+    fi
+
     echo "Cloning to ${SPACK_ROOT}"
     git clone --depth 1 ${SPACK_URL} -b ${SPACK_BRANCH} ${SPACK_ROOT}
   fi

templates/common/build_icon.sh

@@ -4,6 +4,9 @@ WORKDIR=%HPCROOTDIR%
 ICON_VERSION=%ICON.VERSION%
 COMPILER=%SPACK.COMPILER%
 
+MODULES="%MODULES%"
+if [ ! -z "${MODULES}" ]; then module load ${MODULES}; fi
+
 # If the workdir directory does not exist create it
 if [ ! -d ${WORKDIR} ]; then
   mkdir -p ${WORKDIR}

templates/common/build_python_environment.sh

@@ -7,6 +7,10 @@ SPACK_BRANCH=%SPACK.BRANCH%
 SPACK_COMPILER=%SPACK.COMPILER%
 
 PYTHON_VERSION=%PYTHON_ENVIRONMENT.PYTHON_VERSION%
+
+MODULES="%MODULES%"
+if [ ! -z "${MODULES}" ]; then module load ${MODULES}; fi
+
 # Go to the working directory
 cd ${WORKDIR}