Skip to content

Commit 0059519

Browse files
authored
Merge pull request #237 from trz42/sync_nessi_eessi_ci_test_eessi_container_script
using pilot.nessi.no in testing eessi_container.sh
2 parents 79fc90c + 5f2050d commit 0059519

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/test_eessi_container_script.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
elif [[ ${{matrix.SCRIPT_TEST}} == 'listrepos_default' ]]; then
4646
outfile=out_listrepos.txt
4747
./eessi_container.sh --verbose --list-repos | tee ${outfile}
48-
grep "EESSI-pilot" ${outfile}
48+
grep "EESSI" ${outfile}
4949
5050
# test use of --list-repos with custom repos.cfg
5151
elif [[ ${{matrix.SCRIPT_TEST}} == 'listrepos_custom' ]]; then
@@ -57,7 +57,7 @@ jobs:
5757
echo "[EESSI/20HT.TP]" >> cfg/repos.cfg
5858
echo "repo_version = 20HT.TP" >> cfg/repos.cfg
5959
./eessi_container.sh --verbose --list-repos | tee ${outfile}
60-
grep "EESSI-pilot" ${outfile}
60+
grep "EESSI" ${outfile}
6161
6262
export EESSI_REPOS_CFG_DIR_OVERRIDE=${PWD}/cfg
6363
./eessi_container.sh --verbose --list-repos | tee ${outfile2}
@@ -90,15 +90,15 @@ jobs:
9090
elif [[ ${{matrix.SCRIPT_TEST}} == 'readwrite' ]]; then
9191
outfile=out_readwrite.txt
9292
fn="test_${RANDOM}.txt"
93-
echo "touch /cvmfs/pilot.eessi-hpc.org/${fn}" > test_script.sh
93+
echo "touch /cvmfs/pilot.nessi.no/${fn}" > test_script.sh
9494
chmod u+x test_script.sh
9595
export SINGULARITY_BIND="$PWD:/test"
9696
./eessi_container.sh --verbose --access rw --mode run /test/test_script.sh > ${outfile}
9797
9898
tmpdir=$(grep "\-\-resume" ${outfile} | sed "s/.*--resume \([^']*\).*/\1/g")
9999
# note: must use '--access rw' again here, since touched file is in overlay upper dir
100-
./eessi_container.sh --verbose --resume ${tmpdir} --access rw --mode shell <<< "ls -l /cvmfs/pilot.eessi-hpc.org/${fn}" > ${outfile}
101-
grep "/cvmfs/pilot.eessi-hpc.org/${fn}$" $outfile
100+
./eessi_container.sh --verbose --resume ${tmpdir} --access rw --mode shell <<< "ls -l /cvmfs/pilot.nessi.no/${fn}" > ${outfile}
101+
grep "/cvmfs/pilot.nessi.no/${fn}$" $outfile
102102
103103
# test use of --resume
104104
elif [[ ${{matrix.SCRIPT_TEST}} == 'resume' ]]; then
@@ -120,12 +120,12 @@ jobs:
120120
elif [[ ${{matrix.SCRIPT_TEST}} == 'save' ]]; then
121121
outfile=out_save.txt
122122
fn="test_${RANDOM}.txt"
123-
test_cmd="touch /cvmfs/pilot.eessi-hpc.org/${fn}"
123+
test_cmd="touch /cvmfs/pilot.nessi.no/${fn}"
124124
./eessi_container.sh --verbose --mode shell --access rw --save test-save.tar <<< "${test_cmd}" 2>&1 | tee ${outfile}
125125
rm -f ${outfile}
126126
127-
./eessi_container.sh --verbose --mode shell --access rw --resume test-save.tar <<< "ls -l /cvmfs/pilot.eessi-hpc.org/${fn}" > ${outfile}
128-
grep "/cvmfs/pilot.eessi-hpc.org/${fn}$" $outfile
127+
./eessi_container.sh --verbose --mode shell --access rw --resume test-save.tar <<< "ls -l /cvmfs/pilot.nessi.no/${fn}" > ${outfile}
128+
grep "/cvmfs/pilot.nessi.no/${fn}$" $outfile
129129
130130
tar tfv test-save.tar | grep "overlay-upper/${fn}"
131131

0 commit comments

Comments
 (0)