Skip to content

Commit 1373095

Browse files
committed
assume EXPECTED_EASYBUILD_VERSION is set
1 parent 0511d6f commit 1373095

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

.github/workflows/scripts/test_init_scripts.sh

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
export LMOD_PAGER=cat
33

44
if [ -z ${EESSI_VERSION} ] || [ ! -d /cvmfs/software.eessi.io/versions/${EESSI_VERSION} ]; then
5-
echo "\$EESSI_VERSION has to be set to a valid EESSI version."
6-
exit 1
5+
echo "\$EESSI_VERSION has to be set to a valid EESSI version."
6+
exit 1
77
fi
88

9-
declare -A EXPECTED_EASYBUILD_VERSION_IN_EESSI=(
10-
["2023.06"]="5.1.1"
11-
["2025.06"]="5.1.1"
12-
)
9+
if [ -z ${EXPECTED_EASYBUILD_VERSION} ]; then
10+
echo "\$EXPECTED_EASYBUILD_VERSION has to be set to an EasyBuild version that is expected to be available in EESSI version ${EESSI_VERSION}."
11+
exit 1
12+
fi
1313

1414
# initialize assert framework
1515
if [ ! -d assert.sh ]; then
@@ -40,14 +40,13 @@ for shell in ${SHELLS[@]}; do
4040
# TEST 3: Check if module overviews second section is the EESSI init module
4141
assert "echo ${MODULE_SECTIONS[4]}" "/cvmfs/software.eessi.io/versions/$EESSI_VERSION/init/modules"
4242
# Test 4: Load EasyBuild module and check version
43-
EASYBUILD_VERSION=${EXPECTED_EASYBUILD_VERSION_IN_EESSI[${EESSI_VERSION}]}
44-
# eb --version outputs: "This is EasyBuild 5.1.1 (framework: 5.1.1, easyblocks: 5.1.1) on host ..."
45-
command="$shell -c 'source init/lmod/$shell 2>/dev/null; module load EasyBuild/${EASYBUILD_VERSION}; eb --version | cut -d \" \" -f4'"
46-
assert "$command" "$EASYBUILD_VERSION"
43+
# eb --version outputs: "This is EasyBuild 5.1.1 (framework: 5.1.1, easyblocks: 5.1.1) on host ..."
44+
command="$shell -c 'source init/lmod/$shell 2>/dev/null; module load EasyBuild/${EXPECTED_EASYBUILD_VERSION}; eb --version | cut -d \" \" -f4'"
45+
assert "$command" "$EXPECTED_EASYBUILD_VERSION"
4746
# Test 5: Load EasyBuild module and check path
48-
EASYBUILD_PATH=$($shell -c "source init/lmod/$shell 2>/dev/null; module load EasyBuild/${EASYBUILD_VERSION}; which eb")
47+
EASYBUILD_PATH=$($shell -c "source init/lmod/$shell 2>/dev/null; module load EasyBuild/${EXPECTED_EASYBUILD_VERSION}; which eb")
4948
# escape the dots in ${EASYBUILD_VERSION}
50-
PATTERN="/cvmfs/software\.eessi\.io/versions/$EESSI_VERSION/software/linux/x86_64/(intel/haswell|amd/zen3)/software/EasyBuild/${EASYBUILD_VERSION//./\\.}/bin/eb"
49+
PATTERN="/cvmfs/software\.eessi\.io/versions/$EESSI_VERSION/software/linux/x86_64/(intel/haswell|amd/zen3)/software/EasyBuild/${EXPECTED_EASYBUILD_VERSION//./\\.}/bin/eb"
5150
echo "$EASYBUILD_PATH" | grep -E "$PATTERN"
5251
assert_raises 'echo "$EASYBUILD_PATH" | grep -E "$PATTERN"'
5352

0 commit comments

Comments
 (0)