Skip to content

Commit 12a0178

Browse files
adrpoadrpo
authored
drop v1.25 and add v1.27 (#286)
1 parent 1dd4db7 commit 12a0178

2 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎.CI/Jenkinsfile‎

Lines changed: 40 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_25', defaultValue: false, description: 'maintenance/v1.25 branch (ryzen-5950x-1)')
76
booleanParam(name: 'v1_26', defaultValue: false, description: 'maintenance/v1.26 branch (ryzen-5950x-1)')
7+
booleanParam(name: 'v1_27', defaultValue: false, description: 'maintenance/v1.27 branch (ryzen-5950x-1)')
88
booleanParam(name: 'master', defaultValue: false, description: 'master branch (ryzen-5950x-1)')
99

10-
booleanParam(name: 'fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)')
1110
booleanParam(name: 'fmi_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with FMI (ryzen-5950x-2)')
11+
booleanParam(name: 'fmi_v1_27', defaultValue: false, description: 'maintenance/v1.27 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_25', defaultValue: false, description: 'maintenance/v1.25 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')
1514
booleanParam(name: 'cs_fmu_cvode_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)')
15+
booleanParam(name: 'cs_fmu_cvode_v1_27', defaultValue: false, description: 'maintenance/v1.27 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_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)')
1918
booleanParam(name: 'fmpy_fmi_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with FMI (ryzen-5950x-2)')
19+
booleanParam(name: 'fmpy_fmi_v1_27', defaultValue: false, description: 'maintenance/v1.27 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_25', defaultValue: false, description: 'maintenance/v1.25 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2827
booleanParam(name: 'cpp_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
28+
booleanParam(name: 'cpp_v1_27', defaultValue: false, description: 'maintenance/v1.27 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')
@@ -43,7 +43,7 @@ pipeline {
4343
stages {
4444
stage('test') { parallel {
4545

46-
stage('v1.25') {
46+
stage('v1.26') {
4747
agent {
4848
node {
4949
label 'ryzen-5950x-1'
@@ -53,14 +53,14 @@ pipeline {
5353
options { skipDefaultCheckout() }
5454
when {
5555
beforeAgent true
56-
expression { params.v1_25 }
56+
expression { params.v1_26 }
5757
}
5858
steps {
59-
runRegressiontest('maintenance/v1.25', 'v1.25', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
59+
runRegressiontest('maintenance/v1.26', 'v1.26', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
6060
}
6161
}
6262

63-
stage('v1.26') {
63+
stage('v1.27') {
6464
agent {
6565
node {
6666
label 'ryzen-5950x-1'
@@ -70,10 +70,10 @@ pipeline {
7070
options { skipDefaultCheckout() }
7171
when {
7272
beforeAgent true
73-
expression { params.v1_26 }
73+
expression { params.v1_27 }
7474
}
7575
steps {
76-
runRegressiontest('maintenance/v1.26', 'v1.26', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
76+
runRegressiontest('maintenance/v1.27', 'v1.27', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
7777
}
7878
}
7979

@@ -128,7 +128,7 @@ pipeline {
128128
}
129129
}
130130

131-
stage('v1.25 FMI with OMSimulator') {
131+
stage('v1.26 FMI with OMSimulator') {
132132
agent {
133133
node {
134134
label 'ryzen-5950x-2-1'
@@ -138,13 +138,13 @@ pipeline {
138138
options { skipDefaultCheckout() }
139139
when {
140140
beforeAgent true
141-
expression { params.fmi_v1_25 }
141+
expression { params.fmi_v1_26 }
142142
}
143143
steps {
144-
runRegressiontest('maintenance/v1.25', 'v1.25-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
144+
runRegressiontest('maintenance/v1.26', 'v1.26-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
145145
}
146146
}
147-
stage('v1.26 FMI with OMSimulator') {
147+
stage('v1.27 FMI with OMSimulator') {
148148
agent {
149149
node {
150150
label 'ryzen-5950x-2-1'
@@ -154,10 +154,10 @@ pipeline {
154154
options { skipDefaultCheckout() }
155155
when {
156156
beforeAgent true
157-
expression { params.fmi_v1_26 }
157+
expression { params.fmi_v1_27 }
158158
}
159159
steps {
160-
runRegressiontest('maintenance/v1.26', 'v1.26-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
160+
runRegressiontest('maintenance/v1.27', 'v1.27-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
161161
}
162162
}
163163
stage('master FMI with OMSimulator') {
@@ -177,7 +177,7 @@ pipeline {
177177
}
178178
}
179179

180-
stage('v1.25 CVODE CS-FMUs with OMSimulator') {
180+
stage('v1.26 CVODE CS-FMUs with OMSimulator') {
181181
agent {
182182
node {
183183
label 'ryzen-5950x-2-1'
@@ -187,13 +187,13 @@ pipeline {
187187
options { skipDefaultCheckout() }
188188
when {
189189
beforeAgent true
190-
expression { params.cs_fmu_cvode_v1_25 }
190+
expression { params.cs_fmu_cvode_v1_26 }
191191
}
192192
steps {
193-
runRegressiontest('maintenance/v1.25', 'v1.25-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
193+
runRegressiontest('maintenance/v1.26', 'v1.26-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
194194
}
195195
}
196-
stage('v1.26 CVODE CS-FMUs with OMSimulator') {
196+
stage('v1.27 CVODE CS-FMUs with OMSimulator') {
197197
agent {
198198
node {
199199
label 'ryzen-5950x-2-1'
@@ -203,10 +203,10 @@ pipeline {
203203
options { skipDefaultCheckout() }
204204
when {
205205
beforeAgent true
206-
expression { params.cs_fmu_cvode_v1_26 }
206+
expression { params.cs_fmu_cvode_v1_27 }
207207
}
208208
steps {
209-
runRegressiontest('maintenance/v1.26', 'v1.26-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
209+
runRegressiontest('maintenance/v1.27', 'v1.27-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
210210
}
211211
}
212212
stage('master CVODE CS-FMUs with OMSimulator') {
@@ -226,7 +226,7 @@ pipeline {
226226
}
227227
}
228228

229-
stage('v1.25 FMI with FMPy') {
229+
stage('v1.26 FMI with FMPy') {
230230
agent {
231231
node {
232232
label 'ryzen-5950x-2-1'
@@ -236,14 +236,14 @@ pipeline {
236236
options { skipDefaultCheckout() }
237237
when {
238238
beforeAgent true
239-
expression { params.fmpy_fmi_v1_25 }
239+
expression { params.fmpy_fmi_v1_26 }
240240
}
241241
steps {
242-
runRegressiontest('maintenance/v1.25', 'v1.25-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
242+
runRegressiontest('maintenance/v1.26', 'v1.26-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
243243
}
244244
}
245245

246-
stage('v1.26 FMI with FMPy') {
246+
stage('v1.27 FMI with FMPy') {
247247
agent {
248248
node {
249249
label 'ryzen-5950x-2-1'
@@ -253,10 +253,10 @@ pipeline {
253253
options { skipDefaultCheckout() }
254254
when {
255255
beforeAgent true
256-
expression { params.fmpy_fmi_v1_26 }
256+
expression { params.fmpy_fmi_v1_27 }
257257
}
258258
steps {
259-
runRegressiontest('maintenance/v1.26', 'v1.26-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
259+
runRegressiontest('maintenance/v1.27', 'v1.27-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
260260
}
261261
}
262262

@@ -406,7 +406,7 @@ pipeline {
406406
}
407407
}
408408

409-
stage('C++ v1.25') {
409+
stage('C++ v1.26') {
410410
agent {
411411
node {
412412
label 'ryzen-5950x-2-1'
@@ -416,13 +416,13 @@ pipeline {
416416
options { skipDefaultCheckout() }
417417
when {
418418
beforeAgent true
419-
expression { params.cpp_v1_25 }
419+
expression { params.cpp_v1_26 }
420420
}
421421
steps {
422-
runRegressiontest('maintenance/v1.25', 'v1.25-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
422+
runRegressiontest('maintenance/v1.26', 'v1.26-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
423423
}
424424
}
425-
stage('C++ v1.26') {
425+
stage('C++ v1.27') {
426426
agent {
427427
node {
428428
label 'ryzen-5950x-2-1'
@@ -432,10 +432,10 @@ pipeline {
432432
options { skipDefaultCheckout() }
433433
when {
434434
beforeAgent true
435-
expression { params.cpp_v1_26 }
435+
expression { params.cpp_v1_27 }
436436
}
437437
steps {
438-
runRegressiontest('maintenance/v1.26', 'v1.26-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
438+
runRegressiontest('maintenance/v1.27', 'v1.27-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
439439
}
440440
}
441441

@@ -468,10 +468,10 @@ pipeline {
468468
}
469469
when {
470470
beforeAgent true
471-
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}
471+
expression { params.v1_25 || params.v1_26 || params.v1_27 || params.master || params.conversion_script || params.report_ryzen_5950x_1 || params.newInst_newBackend || params.generateSymbolicJacobian || params.heavy_tests}
472472
}
473473
environment {
474-
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'
474+
GITBRANCHES = 'maintenance/v1.20 maintenance/v1.21 maintenance/v1.22 maintenance/v1.23 maintenance/v1.24 maintenance/v1.25 maintenance/v1.26 maintenance/v1.27 master newInst-newBackend'
475475
PYTHONIOENCODING = 'utf-8'
476476
IDA_EMAIL = credentials('IDA email')
477477
}
@@ -530,14 +530,14 @@ pipeline {
530530
}
531531
when {
532532
beforeAgent true
533-
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}
533+
expression { params.fmi_v1_25 || params.fmi_v1_26 || params.fmi_v1_27 || params.fmi_master || params.fmpy_fmi_v1_25 || params.fmpy_fmi_v1_26 || params.fmpy_fmi_v1_27 || 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}
534534
}
535535
environment {
536-
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'
536+
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.27-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 maintenance/v1.27-fmi-fmpy master-fmi master-fmi-fmpy'
537537
GITBRANCHES_NEWINST = 'oldInst'
538538
GITBRANCHES_DAE = 'newInst-daeMode'
539539
GITBRANCHES_NEWBACKEND_DAE = 'newBackend-daeMode'
540-
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'
540+
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 v1.27-cpp'
541541
PYTHONIOENCODING = 'utf-8'
542542
IDA_EMAIL = credentials('IDA email')
543543
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ rm -rf $refdir/MAP-LIB_ReferenceResults/
208208
test -f MAP-LIB_ReferenceResults.git/config || git clone --bare https://github.com/modelica/MAP-LIB_ReferenceResults.git MAP-LIB_ReferenceResults.git
209209
cd MAP-LIB_ReferenceResults.git
210210
git fetch origin '*:*'
211-
git fetch --tags
211+
git fetch --tags --force
212212
213213
for tag in $(git for-each-ref --format="%(refname:lstrip=-1)" refs/heads/)
214214
do

0 commit comments

Comments
 (0)