Skip to content

Commit 081331d

Browse files
committed
Remove configure_easybuild script
1 parent 80260eb commit 081331d

File tree

4 files changed

+8
-74
lines changed

4 files changed

+8
-74
lines changed

bot/inspect.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -382,15 +382,12 @@ else
382382
fatal_error "Failed to initialize Lmod?! (see output in ${ml_version_out}"
383383
fi
384384
385-
echo ">> Configuring EasyBuild..."
386-
source $TOPDIR/configure_easybuild
387-
388385
echo ">> Setting up \$MODULEPATH..."
389386
# make sure no modules are loaded
390387
module --force purge
391388
# ignore current $MODULEPATH entirely
392389
module unuse $MODULEPATH
393-
module use $EASYBUILD_INSTALLPATH/modules/all
390+
module use $EESSI_SOFTWARE_PATH/modules/all
394391
if [[ -z ${MODULEPATH} ]]; then
395392
fatal_error "Failed to set up \$MODULEPATH?!"
396393
else
@@ -405,14 +402,15 @@ echo " - job directory is $HOME (\$HOME), check for slurm-*.out file"
405402
echo " - temporary data of the job is available at /tmp"
406403
echo " - note, the prefix $EESSI_PREFIX is writable"
407404
echo
408-
echo "You may want to load an EasyBuild module. The inspect.sh script does not load"
409-
echo "that automatically, because multiple versions might have been used by the job."
405+
echo "You may want to load an EasyBuild/EESSI-extend modules. The inspect.sh script does not"
406+
echo "load those automatically, because multiple versions might have been used by the job."
410407
echo "Choose an EasyBuild version (see installed versions with 'module avail EasyBuild')"
411408
echo "and simply run"
412409
echo
413410
echo "module load EasyBuild/_VERSION_"
411+
echo "module load EEESSI-extend"
414412
echo
415-
echo "Replace _VERSION_ with the version you want to use."
413+
echo "Replace _VERSION_ with the EasyBuild version you want/need to use."
416414
echo
417415
418416
EOF

check_missing_installations.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ LOCAL_TMPDIR=$(mktemp -d)
2727

2828
source $TOPDIR/scripts/utils.sh
2929

30-
source $TOPDIR/configure_easybuild
30+
# configure EasyBuild via EESSI-extend
31+
module load EESSI-extend
3132

3233
echo ">> Active EasyBuild configuration when checking for missing installations:"
3334
${EB:-eb} --show-config

configure_easybuild

Lines changed: 0 additions & 65 deletions
This file was deleted.

load_eessi_extend_module.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ if [ "${install_eessi_extend}" = true ] || [ "${rebuild_eessi_extend}" = true ];
9696
ORIG_PATH=${PATH}
9797
ORIG_PYTHONPATH=${PYTHONPATH}
9898

99-
# source configure_easybuild to use correct eb settings
99+
# minimally configure easybuild to get EESSI-extend in the right place
100100
(
101101
export EASYBUILD_PREFIX=${TMPDIR}/easybuild
102102
export EASYBUILD_READ_ONLY_INSTALLDIR=1

0 commit comments

Comments
 (0)