MAke sure the bot sets the right environment variables

Author: ocaisa

EESSI-install-software.sh

@@ -284,6 +284,11 @@ if [[ ! -z ${EESSI_DEV_PROJECT} ]]; then
     echo ">> \$EESSI_PROJECT_INSTALL set to ${EESSI_PROJECT_INSTALL}"
 fi
 
+# If we have EESSI_ACCELERATOR_TARGET_OVERRIDE set (and non-empty), then this implies building for a GPU target
+if [[ -n "$EESSI_ACCELERATOR_TARGET_OVERRIDE" ]]; then
+  export EESSI_ACCELERATOR_INSTALL=1
+fi
+
 echo "DEBUG: before loading EESSI-extend // EASYBUILD_INSTALLPATH='${EASYBUILD_INSTALLPATH}'"
 source $TOPDIR/load_eessi_extend_module.sh ${EESSI_VERSION}
 echo "DEBUG: after loading EESSI-extend //  EASYBUILD_INSTALLPATH='${EASYBUILD_INSTALLPATH}'"

bot/build.sh

@@ -162,8 +162,8 @@ export EESSI_SOFTWARE_SUBDIR_OVERRIDE
 echo "bot/build.sh: EESSI_SOFTWARE_SUBDIR_OVERRIDE='${EESSI_SOFTWARE_SUBDIR_OVERRIDE}'"
 
 # determine accelerator target (if any) from .architecture in ${JOB_CFG_FILE}
-export EESSI_ACCELERATOR_TARGET=$(cfg_get_value "architecture" "accelerator")
-echo "bot/build.sh: EESSI_ACCELERATOR_TARGET='${EESSI_ACCELERATOR_TARGET}'"
+export EESSI_ACCELERATOR_TARGET_OVERRIDE="accel/$(cfg_get_value architecture accelerator)"
+echo "bot/build.sh: EESSI_ACCELERATOR_TARGET_OVERRIDE='${EESSI_ACCELERATOR_TARGET_OVERRIDE}'"
 
 # get EESSI_OS_TYPE from .architecture.os_type in ${JOB_CFG_FILE} (default: linux)
 EESSI_OS_TYPE=$(cfg_get_value "architecture" "os_type")