Skip to content

Commit 32a399c

Browse files
casellacasella
authored
Updates after branching off the 1.25 maintenance branch (#203)
1 parent db639b2 commit 32a399c

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎.CI/Jenkinsfile

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

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

10-
booleanParam(name: 'fmi_v1_23', defaultValue: false, description: 'maintenance/v1.23 branch with FMI (ryzen-5950x-2)')
1110
booleanParam(name: 'fmi_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch with FMI (ryzen-5950x-2)')
11+
booleanParam(name: 'fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 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: 'fmpy_fmi_v1_23', defaultValue: false, description: 'maintenance/v1.23 branch with FMI (ryzen-5950x-2)')
1514
booleanParam(name: 'fmpy_fmi_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch with FMI (ryzen-5950x-2)')
15+
booleanParam(name: 'fmpy_fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)')
1616
booleanParam(name: 'fmpy_fmi_master', defaultValue: false, description: 'master branch with FMI running FMPy (ryzen-5950x-2)')
1717

1818
booleanParam(name: 'newInst_daeMode', defaultValue: false, description: 'master branch, --daeMode with -d=newInst (ryzen-5950x-2)')
1919
booleanParam(name: 'newInst_newBackend', defaultValue: false, description: 'master branch, -d=newInst --newBackend, (ryzen-5950x-1)')
2020
booleanParam(name: 'oldInst', defaultValue: false, description: 'master branch, with -d=nonewInst (ryzen-5950x-2)')
2121

22-
booleanParam(name: 'cpp_v1_23', defaultValue: false, description: 'maintenance/v1.23 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2322
booleanParam(name: 'cpp_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
23+
booleanParam(name: 'cpp_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2424
booleanParam(name: 'cpp', defaultValue: false, description: 'master branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2525
booleanParam(name: 'report_ryzen_5950x_1', defaultValue: false, description: 'Generate a report for ryzen-5950x-1 without running the tests')
2626
booleanParam(name: 'report_ryzen_5950x_2', defaultValue: false, description: 'Generate a report for ryzen-5950x-2 without running the tests')
@@ -37,7 +37,7 @@ pipeline {
3737
stages {
3838
stage('test') { parallel {
3939

40-
stage('v1.23') {
40+
stage('v1.24') {
4141
agent {
4242
node {
4343
label 'ryzen-5950x-1'
@@ -47,14 +47,14 @@ pipeline {
4747
options { skipDefaultCheckout() }
4848
when {
4949
beforeAgent true
50-
expression { params.v1_23 }
50+
expression { params.v1_24 }
5151
}
5252
steps {
53-
runRegressiontest('maintenance/v1.23', 'v1.23', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
53+
runRegressiontest('maintenance/v1.24', 'v1.24', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
5454
}
5555
}
5656

57-
stage('v1.24') {
57+
stage('v1.25') {
5858
agent {
5959
node {
6060
label 'ryzen-5950x-1'
@@ -64,10 +64,10 @@ pipeline {
6464
options { skipDefaultCheckout() }
6565
when {
6666
beforeAgent true
67-
expression { params.v1_24 }
67+
expression { params.v1_25 }
6868
}
6969
steps {
70-
runRegressiontest('maintenance/v1.24', 'v1.24', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
70+
runRegressiontest('maintenance/v1.25', 'v1.25', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
7171
}
7272
}
7373

@@ -122,7 +122,7 @@ pipeline {
122122
}
123123
}
124124

125-
stage('v1.23 FMI with OMSimulator') {
125+
stage('v1.24 FMI with OMSimulator') {
126126
agent {
127127
node {
128128
label 'ryzen-5950x-2-1'
@@ -132,13 +132,13 @@ pipeline {
132132
options { skipDefaultCheckout() }
133133
when {
134134
beforeAgent true
135-
expression { params.fmi_v1_23 }
135+
expression { params.fmi_v1_24 }
136136
}
137137
steps {
138-
runRegressiontest('maintenance/v1.23', 'v1.23-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
138+
runRegressiontest('maintenance/v1.24', 'v1.24-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
139139
}
140140
}
141-
stage('v1.24 FMI with OMSimulator') {
141+
stage('v1.25 FMI with OMSimulator') {
142142
agent {
143143
node {
144144
label 'ryzen-5950x-2-1'
@@ -148,10 +148,10 @@ pipeline {
148148
options { skipDefaultCheckout() }
149149
when {
150150
beforeAgent true
151-
expression { params.fmi_v1_24 }
151+
expression { params.fmi_v1_25 }
152152
}
153153
steps {
154-
runRegressiontest('maintenance/v1.24', 'v1.24-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
154+
runRegressiontest('maintenance/v1.25', 'v1.25-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
155155
}
156156
}
157157
stage('master FMI with OMSimulator') {
@@ -172,7 +172,7 @@ pipeline {
172172
}
173173

174174

175-
stage('v1.23 FMI with FMPy') {
175+
stage('v1.24 FMI with FMPy') {
176176
agent {
177177
node {
178178
label 'ryzen-5950x-2-1'
@@ -182,13 +182,13 @@ pipeline {
182182
options { skipDefaultCheckout() }
183183
when {
184184
beforeAgent true
185-
expression { params.fmpy_fmi_v1_23 }
185+
expression { params.fmpy_fmi_v1_24 }
186186
}
187187
steps {
188-
runRegressiontest('maintenance/v1.23', 'v1.23-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
188+
runRegressiontest('maintenance/v1.24', 'v1.24-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
189189
}
190190
}
191-
stage('v1.24 FMI with FMPy') {
191+
stage('v1.25 FMI with FMPy') {
192192
agent {
193193
node {
194194
label 'ryzen-5950x-2-1'
@@ -198,10 +198,10 @@ pipeline {
198198
options { skipDefaultCheckout() }
199199
when {
200200
beforeAgent true
201-
expression { params.fmpy_fmi_v1_24 }
201+
expression { params.fmpy_fmi_v1_25 }
202202
}
203203
steps {
204-
runRegressiontest('maintenance/v1.24', 'v1.24-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
204+
runRegressiontest('maintenance/v1.25', 'v1.25-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
205205
}
206206
}
207207
stage('master FMI with FMPy') {
@@ -317,7 +317,7 @@ pipeline {
317317
}
318318
}
319319

320-
stage('C++ v1.23') {
320+
stage('C++ v1.24') {
321321
agent {
322322
node {
323323
label 'ryzen-5950x-2-1'
@@ -327,13 +327,13 @@ pipeline {
327327
options { skipDefaultCheckout() }
328328
when {
329329
beforeAgent true
330-
expression { params.cpp_v1_23 }
330+
expression { params.cpp_v1_24 }
331331
}
332332
steps {
333-
runRegressiontest('maintenance/v1.23', 'v1.23-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
333+
runRegressiontest('maintenance/v1.24', 'v1.24-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
334334
}
335335
}
336-
stage('C++ v1.24') {
336+
stage('C++ v1.25') {
337337
agent {
338338
node {
339339
label 'ryzen-5950x-2-1'
@@ -343,10 +343,10 @@ pipeline {
343343
options { skipDefaultCheckout() }
344344
when {
345345
beforeAgent true
346-
expression { params.cpp_v1_23 }
346+
expression { params.cpp_v1_25 }
347347
}
348348
steps {
349-
runRegressiontest('maintenance/v1.24', 'v1.24-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
349+
runRegressiontest('maintenance/v1.25', 'v1.25-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
350350
}
351351
}
352352
stage('C++') {
@@ -381,7 +381,7 @@ pipeline {
381381
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}
382382
}
383383
environment {
384-
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 master newInst-newBackend'
384+
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'
385385
PYTHONIOENCODING = 'utf-8'
386386
IDA_EMAIL = credentials('IDA email')
387387
}
@@ -440,13 +440,13 @@ pipeline {
440440
}
441441
when {
442442
beforeAgent true
443-
expression { params.fmi_v1_23 || params.fmi_v1_24 || params.fmi_master || params.fmpy_fmi_v1_23 || params.fmpy_fmi_v1_24 || params.fmpy_fmi_master || params.newInst_daeMode || params.oldInst || params.report_ryzen_5950x_2 || params.cpp || params.cvode || params.gbode}
443+
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.oldInst || params.report_ryzen_5950x_2 || params.cpp || params.cvode || params.gbode}
444444
}
445445
environment {
446-
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.22-fmi-fmpy maintenance/v1.23-fmi-fmpy maintenance/v1.24-fmi-fmpy master-fmi master-fmi-fmpy'
446+
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'
447447
GITBRANCHES_NEWINST = 'oldInst'
448448
GITBRANCHES_DAE = 'newInst-daeMode'
449-
GITBRANCHES_CPP = 'v1.19-cpp v1.20-cpp v1.21-cpp v1.22-cpp v1.23-cpp v1.24-cpp cpp'
449+
GITBRANCHES_CPP = 'v1.19-cpp v1.20-cpp v1.21-cpp v1.22-cpp v1.23-cpp v1.24-cpp v1.25-cpp cpp'
450450
PYTHONIOENCODING = 'utf-8'
451451
IDA_EMAIL = credentials('IDA email')
452452
}

0 commit comments

Comments
 (0)