Skip to content

Commit 908ebdb

Browse files
ocaisaocaisa
authored
Merge pull request #1162 from boegel/ci_missing_sync_EESSI_2025.06
also check on EESSI 2025.06 w.r.t. missing installations and software layer being in sync across CPU targets
2 parents c5ac331 + a62b125 commit 908ebdb

File tree

2 files changed

+70
-9
lines changed

2 files changed

+70
-9
lines changed

‎.github/workflows/test-software.eessi.io.yml‎

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
permissions:
99
contents: read # to fetch code (actions/checkout)
1010
env:
11-
EESSI_VERSION: '2023.06'
1211
EESSI_ACCELERATOR_TARGETS: |
1312
x86_64/amd/zen2:
1413
- nvidia/cc80
@@ -20,33 +19,90 @@ jobs:
2019
fail-fast: false
2120
matrix:
2221
include:
23-
# Arm CPU targets
22+
# Arm CPU targets (EESSI 2023.06)
2423
- runs_on: ubuntu-24.04-arm
24+
EESSI_VERSION: 2023.06
2525
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic
2626
- runs_on: ubuntu-24.04-arm
27+
EESSI_VERSION: 2023.06
2728
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_n1
2829
- runs_on: ubuntu-24.04-arm
30+
EESSI_VERSION: 2023.06
2931
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_v1
3032
- runs_on: ubuntu-24.04-arm
33+
EESSI_VERSION: 2023.06
3134
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/nvidia/grace
32-
# x86_64 CPU targets
35+
# Arm CPU targets (EESSI 2025.06)
36+
- runs_on: ubuntu-24.04-arm
37+
EESSI_VERSION: 2025.06
38+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/a64fx
39+
- runs_on: ubuntu-24.04-arm
40+
EESSI_VERSION: 2025.06
41+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic
42+
- runs_on: ubuntu-24.04-arm
43+
EESSI_VERSION: 2025.06
44+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_n1
45+
- runs_on: ubuntu-24.04-arm
46+
EESSI_VERSION: 2025.06
47+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_v1
48+
- runs_on: ubuntu-24.04-arm
49+
EESSI_VERSION: 2025.06
50+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/nvidia/grace
51+
# x86_64 CPU targets (EESSI 2023.06)
52+
- runs_on: ubuntu-24.04
53+
EESSI_VERSION: 2023.06
54+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen2
55+
- runs_on: ubuntu-24.04
56+
EESSI_VERSION: 2023.06
57+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen3
58+
- runs_on: ubuntu-24.04
59+
EESSI_VERSION: 2023.06
60+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4
61+
- runs_on: ubuntu-24.04
62+
EESSI_VERSION: 2023.06
63+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell
64+
- runs_on: ubuntu-24.04
65+
EESSI_VERSION: 2023.06
66+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/sapphirerapids
67+
- runs_on: ubuntu-24.04
68+
EESSI_VERSION: 2023.06
69+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/skylake_avx512
70+
- runs_on: ubuntu-24.04
71+
EESSI_VERSION: 2023.06
72+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/icelake
73+
- runs_on: ubuntu-24.04
74+
EESSI_VERSION: 2023.06
75+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/cascadelake
76+
- runs_on: ubuntu-24.04
77+
EESSI_VERSION: 2023.06
78+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
79+
# x86_64 CPU targets (EESSI 2025.06)
3380
- runs_on: ubuntu-24.04
81+
EESSI_VERSION: 2025.06
3482
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen2
3583
- runs_on: ubuntu-24.04
84+
EESSI_VERSION: 2025.06
3685
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen3
3786
- runs_on: ubuntu-24.04
87+
EESSI_VERSION: 2025.06
3888
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4
3989
- runs_on: ubuntu-24.04
90+
EESSI_VERSION: 2025.06
4091
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell
4192
- runs_on: ubuntu-24.04
93+
EESSI_VERSION: 2025.06
4294
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/sapphirerapids
4395
- runs_on: ubuntu-24.04
96+
EESSI_VERSION: 2025.06
4497
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/skylake_avx512
4598
- runs_on: ubuntu-24.04
99+
EESSI_VERSION: 2025.06
46100
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/icelake
47101
- runs_on: ubuntu-24.04
102+
EESSI_VERSION: 2025.06
48103
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/cascadelake
49104
- runs_on: ubuntu-24.04
105+
EESSI_VERSION: 2025.06
50106
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
51107
runs-on: ${{ matrix.runs_on }}
52108
steps:
@@ -77,17 +133,17 @@ jobs:
77133
- name: Check for missing installlations
78134
run: |
79135
export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
80-
source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
136+
source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
81137
# set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash),
82138
# to prevent issues with checks in the Easybuild configuration that use this variable
83139
export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*}
84-
export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION}
140+
export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}
85141
export EESSI_OS_TYPE=linux
86142
env | grep ^EESSI | sort
87143
88144
# first check the CPU-only builds for this CPU target
89145
echo "first run check_missing_installations.sh for CPU-only builds"
90-
for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} .github/workflows/scripts/only_latest_easystacks.sh); do
146+
for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} .github/workflows/scripts/only_latest_easystacks.sh); do
91147
eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')
92148
echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..."
93149
module purge
@@ -107,7 +163,7 @@ jobs:
107163
for accel in ${accelerators}; do
108164
module use ${EESSI_SOFTWARE_PATH}/accel/${accel}/modules/all
109165
echo "checking missing installations for accelerator ${accel} using modulepath: ${MODULEPATH}"
110-
for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do
166+
for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do
111167
eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')
112168
echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..."
113169
module purge
@@ -128,14 +184,14 @@ jobs:
128184
- name: Test check_missing_installations.sh with missing package (GCC/8.3.0)
129185
run: |
130186
export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
131-
source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
187+
source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
132188
# set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash),
133189
# to prevent issues with checks in the Easybuild configuration that use this variable
134190
export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*}
135191
module load EasyBuild
136192
which eb
137193
eb --version
138-
export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION}
194+
export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}
139195
export EESSI_OS_TYPE=linux
140196
env | grep ^EESSI | sort
141197
# create dummy easystack file with a single entry (something that is not installed in EESSI)

‎.github/workflows/test_compare_stacks.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
matrix:
2222
EESSI_VERSION:
2323
- 2023.06
24+
- 2025.06
2425
COMPARISON_ARCH:
26+
- aarch64/a64fx
2527
- aarch64/neoverse_n1
2628
- aarch64/neoverse_v1
2729
- aarch64/nvidia/grace
@@ -33,6 +35,9 @@ jobs:
3335
- x86_64/intel/sapphirerapids
3436
- x86_64/intel/icelake
3537
- x86_64/intel/cascadelake
38+
exclude:
39+
- EESSI_VERSION: 2023.06
40+
COMPARISON_ARCH: aarch64/a64fx
3641
steps:
3742
- name: Check out software-layer repository
3843
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

0 commit comments

Comments
 (0)