Skip to content

Commit aab372e

Browse files
committed
don't hardcode 2023.06 in archdetect GPU CI workflow
1 parent 70e6cee commit aab372e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/tests_archdetect_nvidia_gpu.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
match=$(grep "${pattern}" init.out || true)
7676
test "x${match}" = "x" || (echo "unexpected match found for '${pattern}' in init output" && exit 1)
7777
78-
pattern="Prepending /cvmfs/software.eessi.io/versions/2023.06/software/linux/.*/accel/.*/modules/all to \$MODULEPATH"
78+
pattern="Prepending /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/software/linux/.*/accel/.*/modules/all to \$MODULEPATH"
7979
echo ">>> checking for lack of pattern '${pattern}' in init output..."
8080
match=$(grep "${pattern}" init.out || true)
8181
test "x${match}" = "x" || (echo "unexpected match found for '${pattern}' in init output" && exit 1)
@@ -86,19 +86,19 @@ jobs:
8686
echo ">>> checking for pattern '${pattern}' in init output..."
8787
grep "${pattern}" init.out || (echo "FAILED 1" || exit 1)
8888
89-
pattern="Prepending /cvmfs/software.eessi.io/versions/2023.06/software/linux/.*/accel/.*/modules/all to \$MODULEPATH"
89+
pattern="Prepending /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/software/linux/.*/accel/.*/modules/all to \$MODULEPATH"
9090
echo ">>> checking for lack of pattern '${pattern}' in init output..."
9191
match=$(grep "${pattern}" init.out || true)
9292
test "x${match}" = "x" || (echo "unexpected match found for '${pattern}' in init output" && exit 1)
9393
9494
else
9595
echo ">>> checking for 'accel/nvidia/cc80' in init output..."
9696
grep "archdetect found supported accelerator for CPU target x86_64/amd/zen2: accel/nvidia/cc80" init.out || (echo "FAILED 2" && exit 1)
97-
grep "Prepending /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2/accel/nvidia/cc80/modules/all to \$MODULEPATH" init.out || (echo "FAILED 3" && exit 1)
97+
grep "Prepending /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/software/linux/x86_64/amd/zen2/accel/nvidia/cc80/modules/all to \$MODULEPATH" init.out || (echo "FAILED 3" && exit 1)
9898
fi
9999
100100
echo ">>> checking last line of init output..."
101-
tail -1 init.out | grep "Environment set up to use EESSI (2023.06), have fun!" || (echo "FAILED, full init utput:" && cat init.out && exit 1)
101+
tail -1 init.out | grep "Environment set up to use EESSI (${{matrix.EESSI_VERSION}}), have fun!" || (echo "FAILED, full init utput:" && cat init.out && exit 1)
102102
103103
echo "All checks on init output PASSED"
104104
else
@@ -125,7 +125,7 @@ jobs:
125125
echo ">>> checking for 'accel/nvidia/cc80' in init output..."
126126
grep "archdetect found supported accelerator for CPU target x86_64/amd/zen3: accel/nvidia/cc80" init.out || (echo "FAILED 1" && exit 1)
127127
grep "Using x86_64/amd/zen2 as software subdirectory" init.out || (echo "FAILED 2" && exit 1)
128-
grep "Prepending /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen2/modules/all to \$MODULEPATH" init.out || (echo "FAILED 3" && exit 1)
129-
grep "Prepending /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/amd/zen3/accel/nvidia/cc80/modules/all to \$MODULEPATH" init.out || (echo "FAILED 4" && exit 1)
128+
grep "Prepending /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/software/linux/x86_64/amd/zen2/modules/all to \$MODULEPATH" init.out || (echo "FAILED 3" && exit 1)
129+
grep "Prepending /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/software/linux/x86_64/amd/zen3/accel/nvidia/cc80/modules/all to \$MODULEPATH" init.out || (echo "FAILED 4" && exit 1)
130130
131131
echo "All checks on init output PASSED"

0 commit comments

Comments
 (0)