Skip to content

Commit a4e7200

Browse files
committed
also set $EESSI_VERSION_OVERRIDE for create_lmodsitepackage.py tests
1 parent 5f4b557 commit a4e7200

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

.github/workflows/tests_scripts.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ jobs:
131131
132132
chmod u+x ${test_script}
133133
134+
# make sure that correct EESSI version is used (required because default is a placeholder version)
135+
export EESSI_VERSION_OVERRIDE="${{matrix.EESSI_VERSION}}"
136+
134137
out="${PWD}/test_create_lmodsitepackage.out"
135138
./eessi_container.sh --mode run --verbose /software-layer-scripts/run_in_compat_layer_env.sh /software-layer-scripts/test_lmod_sitepackage.sh 2>&1 | tee ${out}
136139
for pattern in "^Site Pkg location.*/software-layer-scripts/.lmod/SitePackage.lua" "LMOD_SITEPACKAGE_LOCATION.*/software-layer-scripts/.lmod/SitePackage.lua"; do

bot/build.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,22 @@ if [[ ! -z ${SHARED_FS_PATH} ]]; then
287287
BUILD_STEP_ARGS+=("--host-injections" "${SHARED_FS_PATH}/host-injections")
288288
fi
289289

290+
# opt-in to use unionfs overlay tool and debian12 container for EESSI version 2025.06
291+
if [[ "${EESSI_VERSION_OVERRIDE} == "2025.06" ]]; then
292+
BUILD_STEP_ARGS+=("--container" "docker://ghcr.io/eessi/build-node:debian12")
293+
BUILD_STEP_ARGS+=("--overlay-tool" "unionfs")
294+
fi
295+
296+
# allow specifying which container image to use via $EESSI_CONTAINER_IMAGE
297+
if [[ ! -z "${EESSI_CONTAINER_IMAGE}" ]]; then
298+
BUILD_STEP_ARGS+=("--container" "docker://ghcr.io/eessi/${EESSI_CONTAINER_IMAGE}")
299+
fi
300+
301+
# allow specifying which overlay tool to use via $EESSI_OVERLAY_TOOL
302+
if [[ ! -z "${EESSI_OVERLAY_TOOL}" ]]; then
303+
BUILD_STEP_ARGS+=("--overlay-tool" "${EESSI_OVERLAY_TOOL}")
304+
fi
305+
290306
# create tmp file for output of build step
291307
build_outerr=$(mktemp build.outerr.XXXX)
292308

0 commit comments

Comments
 (0)