Skip to content

Commit 3cc869b

Browse files
adrpoadrpo
authored
disable 1.24 and add 1.26 (#274)
1 parent 01ac33b commit 3cc869b

File tree

1 file changed

+43
-40
lines changed

1 file changed

+43
-40
lines changed

‎.CI/Jenkinsfile‎

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@ pipeline {
33
parameters {
44
booleanParam(name: 'OLDLIBS', defaultValue: false, description: 'Also test some outdated libraries')
55

6-
booleanParam(name: 'v1_24', defaultValue: false, description: 'maintenance/v1.24 branch (ryzen-5950x-1)')
76
booleanParam(name: 'v1_25', defaultValue: false, description: 'maintenance/v1.25 branch (ryzen-5950x-1)')
7+
booleanParam(name: 'v1_26', defaultValue: false, description: 'maintenance/v1.26 branch (ryzen-5950x-1)')
88
booleanParam(name: 'master', defaultValue: false, description: 'master branch (ryzen-5950x-1)')
99

10-
booleanParam(name: 'fmi_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch with FMI (ryzen-5950x-2)')
1110
booleanParam(name: 'fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)')
11+
booleanParam(name: 'fmi_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with FMI (ryzen-5950x-2)')
1212
booleanParam(name: 'fmi_master', defaultValue: false, description: 'master branch with FMI running OMSimulator (ryzen-5950x-2)')
1313

14-
booleanParam(name: 'cs_fmu_cvode_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')
1514
booleanParam(name: 'cs_fmu_cvode_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')
15+
booleanParam(name: 'cs_fmu_cvode_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')
1616
booleanParam(name: 'cs_fmu_cvode_master', defaultValue: false, description: 'master branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')
1717

18-
booleanParam(name: 'fmpy_fmi_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch with FMI (ryzen-5950x-2)')
1918
booleanParam(name: 'fmpy_fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)')
19+
booleanParam(name: 'fmpy_fmi_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with FMI (ryzen-5950x-2)')
2020
booleanParam(name: 'fmpy_fmi_master', defaultValue: false, description: 'master branch with FMI running FMPy (ryzen-5950x-2)')
2121

2222
booleanParam(name: 'newInst_daeMode', defaultValue: false, description: 'master branch, --daeMode with -d=newInst (ryzen-5950x-2)')
2323
booleanParam(name: 'newInst_newBackend', defaultValue: false, description: 'master branch, -d=newInst --newBackend, (ryzen-5950x-1)')
2424
booleanParam(name: 'newBackend_daeMode', defaultValue: false, description: 'master branch, --newBackend --daeMode with -d=newInst (ryzen-5950x-2). This is an experimental job that does not run on a fixed schedule.')
2525
booleanParam(name: 'oldInst', defaultValue: false, description: 'master branch, with -d=nonewInst (ryzen-5950x-2)')
2626

27-
booleanParam(name: 'cpp_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2827
booleanParam(name: 'cpp_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
28+
booleanParam(name: 'cpp_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2929
booleanParam(name: 'cpp', defaultValue: false, description: 'master branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
3030
booleanParam(name: 'report_ryzen_5950x_1', defaultValue: false, description: 'Generate a report for ryzen-5950x-1 without running the tests')
3131
booleanParam(name: 'report_ryzen_5950x_2', defaultValue: false, description: 'Generate a report for ryzen-5950x-2 without running the tests')
@@ -45,7 +45,7 @@ pipeline {
4545
stages {
4646
stage('test') { parallel {
4747

48-
stage('v1.24') {
48+
stage('v1.25') {
4949
agent {
5050
node {
5151
label 'ryzen-5950x-1'
@@ -55,14 +55,14 @@ pipeline {
5555
options { skipDefaultCheckout() }
5656
when {
5757
beforeAgent true
58-
expression { params.v1_24 }
58+
expression { params.v1_25 }
5959
}
6060
steps {
61-
runRegressiontest('maintenance/v1.24', 'v1.24', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
61+
runRegressiontest('maintenance/v1.25', 'v1.25', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
6262
}
6363
}
6464

65-
stage('v1.25') {
65+
stage('v1.26') {
6666
agent {
6767
node {
6868
label 'ryzen-5950x-1'
@@ -72,10 +72,10 @@ pipeline {
7272
options { skipDefaultCheckout() }
7373
when {
7474
beforeAgent true
75-
expression { params.v1_25 }
75+
expression { params.v1_26 }
7676
}
7777
steps {
78-
runRegressiontest('maintenance/v1.25', 'v1.25', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
78+
runRegressiontest('maintenance/v1.26', 'v1.26', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
7979
}
8080
}
8181

@@ -130,7 +130,7 @@ pipeline {
130130
}
131131
}
132132

133-
stage('v1.24 FMI with OMSimulator') {
133+
stage('v1.25 FMI with OMSimulator') {
134134
agent {
135135
node {
136136
label 'ryzen-5950x-2-1'
@@ -140,13 +140,13 @@ pipeline {
140140
options { skipDefaultCheckout() }
141141
when {
142142
beforeAgent true
143-
expression { params.fmi_v1_24 }
143+
expression { params.fmi_v1_25 }
144144
}
145145
steps {
146-
runRegressiontest('maintenance/v1.24', 'v1.24-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
146+
runRegressiontest('maintenance/v1.25', 'v1.25-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
147147
}
148148
}
149-
stage('v1.25 FMI with OMSimulator') {
149+
stage('v1.26 FMI with OMSimulator') {
150150
agent {
151151
node {
152152
label 'ryzen-5950x-2-1'
@@ -156,10 +156,10 @@ pipeline {
156156
options { skipDefaultCheckout() }
157157
when {
158158
beforeAgent true
159-
expression { params.fmi_v1_25 }
159+
expression { params.fmi_v1_26 }
160160
}
161161
steps {
162-
runRegressiontest('maintenance/v1.25', 'v1.25-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
162+
runRegressiontest('maintenance/v1.26', 'v1.26-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
163163
}
164164
}
165165
stage('master FMI with OMSimulator') {
@@ -179,7 +179,7 @@ pipeline {
179179
}
180180
}
181181

182-
stage('v1.24 CVODE CS-FMUs with OMSimulator') {
182+
stage('v1.25 CVODE CS-FMUs with OMSimulator') {
183183
agent {
184184
node {
185185
label 'ryzen-5950x-2-1'
@@ -189,13 +189,13 @@ pipeline {
189189
options { skipDefaultCheckout() }
190190
when {
191191
beforeAgent true
192-
expression { params.cs_fmu_cvode_v1_24 }
192+
expression { params.cs_fmu_cvode_v1_25 }
193193
}
194194
steps {
195-
runRegressiontest('maintenance/v1.24', 'v1.24-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
195+
runRegressiontest('maintenance/v1.25', 'v1.25-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
196196
}
197197
}
198-
stage('v1.25 CVODE CS-FMUs with OMSimulator') {
198+
stage('v1.26 CVODE CS-FMUs with OMSimulator') {
199199
agent {
200200
node {
201201
label 'ryzen-5950x-2-1'
@@ -205,10 +205,10 @@ pipeline {
205205
options { skipDefaultCheckout() }
206206
when {
207207
beforeAgent true
208-
expression { params.cs_fmu_cvode_v1_25 }
208+
expression { params.cs_fmu_cvode_v1_26 }
209209
}
210210
steps {
211-
runRegressiontest('maintenance/v1.25', 'v1.25-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
211+
runRegressiontest('maintenance/v1.26', 'v1.26-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
212212
}
213213
}
214214
stage('master CVODE CS-FMUs with OMSimulator') {
@@ -228,7 +228,7 @@ pipeline {
228228
}
229229
}
230230

231-
stage('v1.24 FMI with FMPy') {
231+
stage('v1.25 FMI with FMPy') {
232232
agent {
233233
node {
234234
label 'ryzen-5950x-2-1'
@@ -238,13 +238,14 @@ pipeline {
238238
options { skipDefaultCheckout() }
239239
when {
240240
beforeAgent true
241-
expression { params.fmpy_fmi_v1_24 }
241+
expression { params.fmpy_fmi_v1_25 }
242242
}
243243
steps {
244-
runRegressiontest('maintenance/v1.24', 'v1.24-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
244+
runRegressiontest('maintenance/v1.25', 'v1.25-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
245245
}
246246
}
247-
stage('v1.25 FMI with FMPy') {
247+
248+
stage('v1.26 FMI with FMPy') {
248249
agent {
249250
node {
250251
label 'ryzen-5950x-2-1'
@@ -254,12 +255,13 @@ pipeline {
254255
options { skipDefaultCheckout() }
255256
when {
256257
beforeAgent true
257-
expression { params.fmpy_fmi_v1_25 }
258+
expression { params.fmpy_fmi_v1_26 }
258259
}
259260
steps {
260-
runRegressiontest('maintenance/v1.25', 'v1.25-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
261+
runRegressiontest('maintenance/v1.26', 'v1.26-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
261262
}
262263
}
264+
263265
stage('master FMI with FMPy') {
264266
agent {
265267
node {
@@ -423,7 +425,7 @@ pipeline {
423425
}
424426
}
425427

426-
stage('C++ v1.24') {
428+
stage('C++ v1.25') {
427429
agent {
428430
node {
429431
label 'ryzen-5950x-2-1'
@@ -433,13 +435,13 @@ pipeline {
433435
options { skipDefaultCheckout() }
434436
when {
435437
beforeAgent true
436-
expression { params.cpp_v1_24 }
438+
expression { params.cpp_v1_25 }
437439
}
438440
steps {
439-
runRegressiontest('maintenance/v1.24', 'v1.24-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
441+
runRegressiontest('maintenance/v1.25', 'v1.25-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
440442
}
441443
}
442-
stage('C++ v1.25') {
444+
stage('C++ v1.26') {
443445
agent {
444446
node {
445447
label 'ryzen-5950x-2-1'
@@ -449,12 +451,13 @@ pipeline {
449451
options { skipDefaultCheckout() }
450452
when {
451453
beforeAgent true
452-
expression { params.cpp_v1_25 }
454+
expression { params.cpp_v1_26 }
453455
}
454456
steps {
455-
runRegressiontest('maintenance/v1.25', 'v1.25-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
457+
runRegressiontest('maintenance/v1.26', 'v1.26-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
456458
}
457459
}
460+
458461
stage('C++') {
459462
agent {
460463
node {
@@ -484,10 +487,10 @@ pipeline {
484487
}
485488
when {
486489
beforeAgent true
487-
expression { params.v1_23 || params.v1_24 || params.master || params.conversion_script || params.report_ryzen_5950x_1 | params.newInst_newBackend || params.generateSymbolicJacobian || params.heavy_tests}
490+
expression { params.v1_25 || params.v1_26 || params.master || params.conversion_script || params.report_ryzen_5950x_1 | params.newInst_newBackend || params.generateSymbolicJacobian || params.heavy_tests}
488491
}
489492
environment {
490-
GITBRANCHES = 'maintenance/v1.12 maintenance/v1.13 maintenance/v1.14 maintenance/v1.16 maintenance/v1.17 maintenance/v1.18 maintenance/v1.19 maintenance/v1.20 maintenance/v1.21 maintenance/v1.22 maintenance/v1.23 maintenance/v1.24 maintenance/v1.25 master newInst-newBackend'
493+
GITBRANCHES = 'maintenance/v1.20 maintenance/v1.21 maintenance/v1.22 maintenance/v1.23 maintenance/v1.24 maintenance/v1.25 maintenance/v1.26 master newInst-newBackend'
491494
PYTHONIOENCODING = 'utf-8'
492495
IDA_EMAIL = credentials('IDA email')
493496
}
@@ -546,14 +549,14 @@ pipeline {
546549
}
547550
when {
548551
beforeAgent true
549-
expression { params.fmi_v1_24 || params.fmi_v1_25 || params.fmi_master || params.fmpy_fmi_v1_24 || params.fmpy_fmi_v1_25 || params.fmpy_fmi_master || params.newInst_daeMode || params.newBackend_daeMode || params.oldInst || params.report_ryzen_5950x_2 || params.cpp || params.cvode || params.gbode || params.ida}
552+
expression { params.fmi_v1_25 || params.fmi_v1_26 || params.fmi_master || params.fmpy_fmi_v1_25 || params.fmpy_fmi_v1_26 || params.fmpy_fmi_master || params.newInst_daeMode || params.newBackend_daeMode || params.oldInst || params.report_ryzen_5950x_2 || params.cpp || params.cvode || params.gbode || params.ida}
550553
}
551554
environment {
552-
GITBRANCHES_FMI = 'maintenance/v1.12-fmi maintenance/v1.13-fmi maintenance/v1.14-fmi maintenance/v1.16-fmi maintenance/v1.17-fmi maintenance/v1.18-fmi maintenance/v1.19-fmi maintenance/v1.20-fmi maintenance/v1.21-fmi maintenance/v1.22-fmi maintenance/v1.23-fmi maintenance/v1.24-fmi maintenance/v1.25-fmi maintenance/v1.22-fmi-fmpy maintenance/v1.23-fmi-fmpy maintenance/v1.24-fmi-fmpy maintenance/v1.25-fmi-fmpy master-fmi master-fmi-fmpy'
555+
GITBRANCHES_FMI = 'maintenance/v1.20-fmi maintenance/v1.21-fmi maintenance/v1.22-fmi maintenance/v1.23-fmi maintenance/v1.24-fmi maintenance/v1.25-fmi maintenance/v1.26-fmi maintenance/v1.22-fmi-fmpy maintenance/v1.23-fmi-fmpy maintenance/v1.24-fmi-fmpy maintenance/v1.25-fmi-fmpy maintenance/v1.26-fmi-fmpy master-fmi master-fmi-fmpy'
553556
GITBRANCHES_NEWINST = 'oldInst'
554557
GITBRANCHES_DAE = 'newInst-daeMode'
555558
GITBRANCHES_NEWBACKEND_DAE = 'newBackend-daeMode'
556-
GITBRANCHES_CPP = 'v1.19-cpp v1.20-cpp v1.21-cpp v1.22-cpp v1.23-cpp v1.24-cpp v1.25-cpp cpp'
559+
GITBRANCHES_CPP = 'v1.19-cpp v1.20-cpp v1.21-cpp v1.22-cpp v1.23-cpp v1.24-cpp v1.25-cpp cpp v1.26-cpp cpp'
557560
PYTHONIOENCODING = 'utf-8'
558561
IDA_EMAIL = credentials('IDA email')
559562
}

0 commit comments

Comments
 (0)