Skip to content

Commit dd37dfd

Browse files
committed
also set $EESSI_VERSION_OVERRIDE for install_software_layer.sh script tests
1 parent f9392e6 commit dd37dfd

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.github/workflows/tests_scripts.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ jobs:
7777
echo 'eb --version' >> ${test_script}
7878
7979
chmod u+x ${test_script}
80-
echo ">> Contents of ${test_script}:"
81-
cat ${test_script}
80+
81+
# make sure that correct EESSI version is used (required because default is a placeholder version)
82+
export EESSI_VERSION_OVERRIDE="${{matrix.EESSI_VERSION}}"
8283
8384
# run wrapper script + capture & check output
8485
out="${PWD}/eb-${EB_VERSION}.out"
85-
export EESSI_VERSION_OVERRIDE="${{matrix.EESSI_VERSION}}"
8686
./eessi_container.sh --access rw --mode run --verbose /software-layer-scripts/run_in_compat_layer_env.sh /software-layer-scripts/eb-${EB_VERSION}.sh 2>&1 | tee ${out}
8787
pattern="^This is EasyBuild ${EB_VERSION} "
8888
grep "${pattern}" ${out} || (echo "Pattern '${pattern}' not found in output!" && exit 1)
@@ -96,12 +96,17 @@ jobs:
9696
sed -i "s@./EESSI-install-software.sh@\"export EESSI_SOFTWARE_SUBDIR_OVERRIDE='x86_64/generic'; ./EESSI-install-software.sh\"@g" install_software_layer.sh
9797
# skip installation of CUDA SDKs, since this is too heavy for CI
9898
sed -i "s@./EESSI-install-software.sh@./EESSI-install-software.sh --skip-cuda-install@g" install_software_layer.sh
99+
100+
# make sure that correct EESSI version is used (required because default is a placeholder version)
101+
export EESSI_VERSION_OVERRIDE="${{matrix.EESSI_VERSION}}"
102+
99103
./eessi_container.sh --mode run --verbose /software-layer-scripts/install_software_layer.sh
100104
101105
- name: test create_directory_tarballs.sh script
102106
run: |
103107
# bind current directory into container as /software-layer-scripts
104108
export SINGULARITY_BIND="${PWD}:/software-layer-scripts"
109+
105110
# scripts need to be copied to /tmp,
106111
# since create_directory_tarballs.sh must be accessible from within build container
107112
./eessi_container.sh --mode run --verbose /software-layer-scripts/create_directory_tarballs.sh 2023.06

0 commit comments

Comments
 (0)