Skip to content

Commit d5362ab

Browse files
committed
use mode exec instead of run
1 parent 01aba0c commit d5362ab

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/test_eessi_container_script.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- listrepos_default
1919
- listrepos_custom
2020
- no_cvmfs_mounts
21-
- run
21+
- exec
2222
- shell
2323
- container
2424
- resume
@@ -74,18 +74,18 @@ jobs:
7474
# test use of --repository None
7575
elif [[ ${{matrix.SCRIPT_TEST}} == 'no_cvmfs_mounts' ]]; then
7676
outfile=out_nocvmfs.txt
77-
./eessi_container.sh --verbose --repository None --mode run mount | tee ${outfile}
77+
./eessi_container.sh --verbose --repository None --mode exec mount | tee ${outfile}
7878
# make sure that there are no CVMFS mounts in the container, i.e. mount does not have any lines line:
7979
# cvmfs2 on /cvmfs/...
8080
! grep "^cvmfs" ${outfile}
8181
82-
# test use of --mode run
83-
elif [[ ${{matrix.SCRIPT_TEST}} == 'run' ]]; then
84-
outfile=out_run.txt
82+
# test use of --mode exec
83+
elif [[ ${{matrix.SCRIPT_TEST}} == 'exec' ]]; then
84+
outfile=out_exec.txt
8585
echo "${test_cmd}" > test_script.sh
8686
chmod u+x test_script.sh
8787
export SINGULARITY_BIND="$PWD:/test"
88-
./eessi_container.sh --verbose --mode run /test/test_script.sh | tee ${outfile}
88+
./eessi_container.sh --verbose --mode exec /test/test_script.sh | tee ${outfile}
8989
grep "${out_pattern}" ${outfile}
9090
9191
# test use of --mode shell
@@ -109,7 +109,7 @@ jobs:
109109
echo "touch /cvmfs/software.eessi.io/${fn}" > test_script.sh
110110
chmod u+x test_script.sh
111111
export SINGULARITY_BIND="$PWD:/test"
112-
./eessi_container.sh --verbose --access rw --mode run /test/test_script.sh > ${outfile}
112+
./eessi_container.sh --verbose --access rw --mode exec /test/test_script.sh > ${outfile}
113113
114114
tmpdir=$(grep "\-\-resume" ${outfile} | sed "s/.*--resume \([^']*\).*/\1/g")
115115
# note: must use '--access rw' again here, since touched file is in overlay upper dir
@@ -152,7 +152,7 @@ jobs:
152152
export SINGULARITY_BIND="$PWD:/test"
153153
echo 'ls -ld /cvmfs*/software.eessi.io/*' > test_script.sh
154154
chmod u+x test_script.sh
155-
./eessi_container.sh --verbose --container ${container} --access rw --overlay-tool unionfs --mode run /test/test_script.sh 2>&1 | tee ${outfile}
155+
./eessi_container.sh --verbose --container ${container} --access rw --overlay-tool unionfs --mode exec /test/test_script.sh 2>&1 | tee ${outfile}
156156
for pattern in "/cvmfs/software.eessi.io/versions" "/cvmfs_ro/software.eessi.io/versions"; do
157157
grep "${pattern}" ${outfile} || (echo "Pattern '${pattern}' not found in ${outfile}"; exit 1)
158158
done

0 commit comments

Comments
 (0)