Skip to content

Commit 3dc1e33

Browse files
denniskleindennisklein
committed
ci: Update
1 parent ede7137 commit 3dc1e33

1 file changed

Lines changed: 31 additions & 23 deletions

File tree

‎Jenkinsfile‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ def jobMatrix(String prefix, String type, List specs) {
2020
def arch = spec.arch
2121
def check = spec.getOrDefault("check", null)
2222
def extra = spec.getOrDefault("extra", null)
23+
def image = spec.getOrDefault("image", null)
2324

2425
nodes[label] = {
2526
node(selector) {
@@ -59,6 +60,9 @@ def jobMatrix(String prefix, String type, List specs) {
5960
sh "bash ${jobscript}"
6061
} else {
6162
def container = "${os}.${ver}.sif"
63+
if (image) {
64+
container = "${os}.${ver}.${image}.sif"
65+
}
6266
sh(label: "Create Slurm Job Script", script: """
6367
exec tests/ci/slurm-create-jobscript.sh "${label}" "${container}" "${jobscript}" ${ctestcmd}
6468
""")
@@ -105,29 +109,33 @@ pipeline{
105109
steps{
106110
script {
107111
def builds = jobMatrix('alfa-ci', 'build', [
108-
// [os: 'centos', ver: '7', arch: 'x86_64', compiler: 'gcc-7', fairsoft: 'apr21_patches'],
109-
// [os: 'centos', ver: '7', arch: 'x86_64', compiler: 'gcc-7', fairsoft: 'apr21_patches_mt'],
110-
[os: 'debian', ver: '10', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'apr21_patches'],
111-
[os: 'debian', ver: '10', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'apr21_patches_mt'],
112-
[os: 'debian', ver: '11', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'apr21_patches'],
113-
[os: 'debian', ver: '11', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'apr21_patches_mt'],
114-
[os: 'debian', ver: '11', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'apr22_patches'],
115-
[os: 'debian', ver: '11', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'apr22_patches_mt'],
116-
// [os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9', fairsoft: 'apr21_patches'],
117-
// [os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9', fairsoft: 'apr21_patches_mt'],
118-
[os: 'ubuntu', ver: 'rolling', arch: 'x86_64', compiler: 'current', fairsoft: 'dev',
119-
check: 'warnings',
120-
extra: '-DUSE_CLANG_TIDY=ON -DBUILD_MBS=OFF -DBUILD_PROOF_SUPPORT=OFF'],
121-
[os: 'fedora', ver: '33', arch: 'x86_64', compiler: 'gcc-10', fairsoft: 'apr21_patches'],
122-
[os: 'fedora', ver: '33', arch: 'x86_64', compiler: 'gcc-10', fairsoft: 'apr21_patches_mt'],
123-
[os: 'macos', ver: '13', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '24.01'],
124-
[os: 'macos', ver: '14', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '24.01'],
125-
[os: 'macos', ver: '14', arch: 'arm64', compiler: 'apple-clang-15', fairsoft: '24.01'],
126-
// [os: 'macos', ver: '13', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '22.11'],
127-
// [os: 'macos', ver: '13', arch: 'arm64', compiler: 'apple-clang-14', fairsoft: '22.11'],
128-
// [os: 'macos', ver: '12', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '23.6'],
129-
// [os: 'macos', ver: '13', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '23.6'],
130-
// [os: 'macos', ver: '13', arch: 'arm64', compiler: 'apple-clang-14', fairsoft: '23.6'],
112+
[os: 'debian', ver: '10', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'jan24_patches', image: 'jan24'],
113+
[os: 'debian', ver: '10', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'jan24_patches_mt', image: 'jan24'],
114+
[os: 'debian', ver: '10', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'nov22_patches', image: 'nov22'],
115+
[os: 'debian', ver: '10', arch: 'x86_64', compiler: 'gcc-8', fairsoft: 'apr22_patches', image: 'apr22'],
116+
[os: 'debian', ver: '11', arch: 'x86_64', compiler: 'gcc-10', fairsoft: 'jan24_patches', image: 'jan24'],
117+
[os: 'debian', ver: '11', arch: 'x86_64', compiler: 'gcc-10', fairsoft: 'jan24_patches_mt', image: 'jan24'],
118+
[os: 'debian', ver: '11', arch: 'x86_64', compiler: 'gcc-10', fairsoft: 'nov22_patches', image: 'nov22'],
119+
[os: 'debian', ver: '11', arch: 'x86_64', compiler: 'gcc-10', fairsoft: 'apr22_patches', image: 'apr22'],
120+
[os: 'debian', ver: '12', arch: 'x86_64', compiler: 'gcc-12', fairsoft: 'jan24_patches', image: 'jan24'],
121+
[os: 'debian', ver: '12', arch: 'x86_64', compiler: 'gcc-12', fairsoft: 'jan24_patches_mt', image: 'jan24'],
122+
[os: 'debian', ver: '12', arch: 'x86_64', compiler: 'gcc-12', fairsoft: 'nov22_patches', image: 'nov22'],
123+
[os: 'fedora', ver: '39', arch: 'x86_64', compiler: 'gcc-13', fairsoft: 'jan24_patches', image: 'jan24'],
124+
[os: 'fedora', ver: '39', arch: 'x86_64', compiler: 'gcc-13', fairsoft: 'jan24_patches_mt', image: 'jan24'],
125+
[os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9', fairsoft: 'jan24_patches', image: 'jan24'],
126+
[os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9', fairsoft: 'jan24_patches_mt', image: 'jan24'],
127+
[os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9', fairsoft: 'nov22_patches', image: 'nov22'],
128+
[os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9', fairsoft: 'apr22_patches', image: 'apr22'],
129+
[os: 'ubuntu', ver: '22.04', arch: 'x86_64', compiler: 'gcc-11', fairsoft: 'jan24_patches', image: 'jan24'],
130+
[os: 'ubuntu', ver: '22.04', arch: 'x86_64', compiler: 'gcc-11', fairsoft: 'jan24_patches_mt', image: 'jan24'],
131+
[os: 'ubuntu', ver: '22.04', arch: 'x86_64', compiler: 'gcc-11', fairsoft: 'nov22_patches', image: 'nov22'],
132+
[os: 'ubuntu', ver: '22.04', arch: 'x86_64', compiler: 'gcc-11', fairsoft: 'apr22_patches', image: 'apr22'],
133+
[os: 'ubuntu', ver: 'rolling', arch: 'x86_64', compiler: 'current', fairsoft: 'dev',
134+
check: 'warnings',
135+
extra: '-DUSE_CLANG_TIDY=ON -DBUILD_MBS=OFF -DBUILD_PROOF_SUPPORT=OFF'],
136+
[os: 'macos', ver: '13', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '24.01'],
137+
[os: 'macos', ver: '14', arch: 'x86_64', compiler: 'apple-clang-14', fairsoft: '24.01'],
138+
[os: 'macos', ver: '14', arch: 'arm64', compiler: 'apple-clang-15', fairsoft: '24.01'],
131139
])
132140

133141
def checks = jobMatrix('alfa-ci', 'check', [

0 commit comments

Comments
 (0)