Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion bot/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,18 @@ fi
echo -n "setting \$STORAGE by replacing any var in '${LOCAL_TMP}' -> "
# replace any env variable in ${LOCAL_TMP} with its
# current value (e.g., a value that is local to the job)
STORAGE=$(envsubst <<< ${LOCAL_TMP})
# We should have set TMPDIR via $LOCAL_TMP already in the bot's slurm script.
# To be sure, we test if TMPDIR is set and simply use that, otherwise we expand
# it here.
if [[ -n ${TMPDIR} && -d ${TMPDIR} ]]; then
# TMPDIR defined and directory exists
STORAGE=${TMPDIR}
else
if [[ -z ${TMPDIR} ]]; then
# TMPDIR not defined
STORAGE=$(envsubst <<< ${LOCAL_TMP})
fi
fi
echo "'${STORAGE}'"

# make sure ${STORAGE} exists
Expand Down
4 changes: 4 additions & 0 deletions create_tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ cpu_arch_subdir=$3
accel_subdir=$4
target_tgz=$5

echo "create_tarball.sh: TMPDIR='${TMPDIR}'"
if [[ ! -z ${TMPDIR} ]]; then
ls -l ${TMPDIR}
fi
tmpdir=`mktemp -d`
echo ">> tmpdir: $tmpdir"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
easyconfigs:
- EasyBuild-4.8.2.eb
- EasyBuild-4.9.0.eb
- EasyBuild-4.9.1.eb
- EasyBuild-4.9.2.eb
- EasyBuild-4.9.3.eb
- EasyBuild-4.9.4.eb:
options:
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21465
from-commit: 39cdebd7bd2cb4a9c170ee22439401316b2e7a25
9 changes: 9 additions & 0 deletions eessi_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ else
# note, (b) & (c) are automatically ensured by using 'mktemp -d --tmpdir' to
# create a temporary directory
if [[ ! -z ${STORAGE} ]]; then
[[ ${VERBOSE} -eq 1 ]] && echo "export TMPDIR=${STORAGE}"
export TMPDIR=${STORAGE}
# mktemp fails if TMPDIR does not exist, so let's create it
mkdir -p ${TMPDIR}
Expand Down Expand Up @@ -529,6 +530,14 @@ BIND_PATHS="${EESSI_CVMFS_VAR_LIB}:/var/lib/cvmfs,${EESSI_CVMFS_VAR_RUN}:/var/ru

# provide a '/tmp' inside the container
BIND_PATHS="${BIND_PATHS},${EESSI_TMPDIR}:${TMP_IN_CONTAINER}"

# if TMPDIR is not empty and if TMP_IN_CONTAINER is not a prefix of TMPDIR, we need to add a bind mount for TMPDIR
if [[ ! -z ${TMPDIR} && ${TMP_IN_CONTAINER} != ${TMPDIR}* ]]; then
echo "TMPDIR is not empty (${TMPDIR}) and TMP_IN_CONTAINER (${TMP_IN_CONTAINER}) is not a prefix of TMPDIR: adding bind mount for TMPDIR"
BIND_PATHS="${BIND_PATHS},${TMPDIR}"
fi

# add bind mount for extra bind paths
if [[ ! -z ${EXTRA_BIND_PATHS} ]]; then
BIND_PATHS="${BIND_PATHS},${EXTRA_BIND_PATHS}"
fi
Expand Down