Skip to content

Commit d234e9e

Browse files
authored
Merge pull request #125 from trz42/nessi.no-2023.06-init-and-add-EasyBuild-4.7.2
init stack NESSI/2023.06
2 parents 2f6709f + 61f8280 commit d234e9e

10 files changed

+614
-326
lines changed

.github/workflows/test_eessi.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
EESSI_VERSION:
13-
- 2021.12
13+
- 2023.06
1414
EESSI_SOFTWARE_SUBDIR:
1515
- aarch64/generic
1616
- aarch64/graviton2
@@ -20,6 +20,8 @@ jobs:
2020
- x86_64/intel/haswell
2121
- x86_64/intel/skylake_avx512
2222
- x86_64/generic
23+
EASYSTACK_FILE:
24+
- eessi-2023.06-eb-4.7.2-2021a.yml
2325
steps:
2426
- name: Check out software-layer repository
2527
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
@@ -31,17 +33,17 @@ jobs:
3133
cvmfs_http_proxy: DIRECT
3234
cvmfs_repositories: pilot.eessi-hpc.org
3335

34-
- name: Test check_missing_installations.sh script
35-
run: |
36-
source /cvmfs/pilot.eessi-hpc.org/versions/${{matrix.EESSI_VERSION}}/init/bash
37-
module load EasyBuild
38-
eb --version
39-
export EESSI_PREFIX=/cvmfs/pilot.eessi-hpc.org/versions/${{matrix.EESSI_VERSION}}
40-
export EESSI_OS_TYPE=linux
41-
export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}}
42-
env | grep ^EESSI | sort
43-
echo "just run check_missing_installations.sh (should use eessi-${{matrix.EESSI_VERSION}}.yml)"
44-
./check_missing_installations.sh
36+
# - name: Test check_missing_installations.sh script
37+
# run: |
38+
# source /cvmfs/pilot.eessi-hpc.org/versions/${{matrix.EESSI_VERSION}}/init/bash
39+
# module load EasyBuild
40+
# eb --version
41+
# export EESSI_PREFIX=/cvmfs/pilot.eessi-hpc.org/versions/${{matrix.EESSI_VERSION}}
42+
# export EESSI_OS_TYPE=linux
43+
# export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}}
44+
# env | grep ^EESSI | sort
45+
# echo "just run check_missing_installations.sh (should use eessi-${{matrix.EESSI_VERSION}}.yml)"
46+
# ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}}
4547

4648
- name: Test check_missing_installations.sh with missing package (GCC/8.3.0)
4749
run: |
@@ -52,18 +54,15 @@ jobs:
5254
export EESSI_OS_TYPE=linux
5355
export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}}
5456
env | grep ^EESSI | sort
55-
echo "modify eessi-${{matrix.EESSI_VERSION}}.yml by adding a missing package (GCC/8.3.0)"
56-
echo " GCC:" >> eessi-${{matrix.EESSI_VERSION}}.yml
57-
echo " toolchains:" >> eessi-${{matrix.EESSI_VERSION}}.yml
58-
echo " SYSTEM:" >> eessi-${{matrix.EESSI_VERSION}}.yml
59-
echo " versions: '8.3.0'" >> eessi-${{matrix.EESSI_VERSION}}.yml
60-
tail -n 4 eessi-${{matrix.EESSI_VERSION}}.yml
57+
echo "modify easystack file by adding a missing package (GCC/8.3.0)"
58+
echo " - GCC-8.3.0:" >> ${{matrix.EASYSTACK_FILE}}
59+
tail -n 5 ${{matrix.EASYSTACK_FILE}}
6160
# note, check_missing_installations.sh exits 1 if a package was
6261
# missing, which is intepreted as false (exit code based, not
6362
# boolean logic), hence when the script exits 0 if no package was
6463
# missing it is interpreted as true, thus the test did not capture
6564
# the missing package
66-
if ./check_missing_installations.sh; then
65+
if ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}}; then
6766
echo "did NOT capture missing package; test FAILED"
6867
exit 1
6968
else

.github/workflows/tests_scripts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@ jobs:
9292
# since create_directory_tarballs.sh must be accessible from within build container
9393
cp -a * /tmp/
9494
cd /tmp
95-
./build_container.sh run /tmp/$USER/EESSI /tmp/create_directory_tarballs.sh 2021.12
95+
./build_container.sh run /tmp/$USER/EESSI /tmp/create_directory_tarballs.sh 2023.06
9696
# check if tarballs have been produced
9797
ls -l *.tar.gz

0 commit comments

Comments
 (0)