From fb7bd77625581491f037222428363166d1175dc9 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Sat, 6 Jun 2026 12:29:29 +0200 Subject: [PATCH] drop v1.25 and add v1.27 --- .CI/Jenkinsfile | 80 ++++++++++++++++++++++++------------------------- README.md | 2 +- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index a32bd6a..a012114 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -3,20 +3,20 @@ pipeline { parameters { booleanParam(name: 'OLDLIBS', defaultValue: false, description: 'Also test some outdated libraries') - booleanParam(name: 'v1_25', defaultValue: false, description: 'maintenance/v1.25 branch (ryzen-5950x-1)') booleanParam(name: 'v1_26', defaultValue: false, description: 'maintenance/v1.26 branch (ryzen-5950x-1)') + booleanParam(name: 'v1_27', defaultValue: false, description: 'maintenance/v1.27 branch (ryzen-5950x-1)') booleanParam(name: 'master', defaultValue: false, description: 'master branch (ryzen-5950x-1)') - booleanParam(name: 'fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)') booleanParam(name: 'fmi_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with FMI (ryzen-5950x-2)') + booleanParam(name: 'fmi_v1_27', defaultValue: false, description: 'maintenance/v1.27 branch with FMI (ryzen-5950x-2)') booleanParam(name: 'fmi_master', defaultValue: false, description: 'master branch with FMI running OMSimulator (ryzen-5950x-2)') - booleanParam(name: 'cs_fmu_cvode_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)') booleanParam(name: 'cs_fmu_cvode_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)') + booleanParam(name: 'cs_fmu_cvode_v1_27', defaultValue: false, description: 'maintenance/v1.27 branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)') booleanParam(name: 'cs_fmu_cvode_master', defaultValue: false, description: 'master branch with CVODE CS FMUs running OMSimulator (ryzen-5950x-2)') - booleanParam(name: 'fmpy_fmi_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch with FMI (ryzen-5950x-2)') booleanParam(name: 'fmpy_fmi_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch with FMI (ryzen-5950x-2)') + booleanParam(name: 'fmpy_fmi_v1_27', defaultValue: false, description: 'maintenance/v1.27 branch with FMI (ryzen-5950x-2)') booleanParam(name: 'fmpy_fmi_master', defaultValue: false, description: 'master branch with FMI running FMPy (ryzen-5950x-2)') booleanParam(name: 'newInst_daeMode', defaultValue: false, description: 'master branch, --daeMode with -d=newInst (ryzen-5950x-2)') @@ -24,8 +24,8 @@ pipeline { 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.') booleanParam(name: 'oldInst', defaultValue: false, description: 'master branch, with -d=nonewInst (ryzen-5950x-2)') - booleanParam(name: 'cpp_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).') booleanParam(name: 'cpp_v1_26', defaultValue: false, description: 'maintenance/v1.26 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).') + booleanParam(name: 'cpp_v1_27', defaultValue: false, description: 'maintenance/v1.27 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).') booleanParam(name: 'cpp', defaultValue: false, description: 'master branch, with --simCodeTarget=Cpp (ryzen-5950x-2).') booleanParam(name: 'report_ryzen_5950x_1', defaultValue: false, description: 'Generate a report for ryzen-5950x-1 without running the tests') 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 { stages { stage('test') { parallel { - stage('v1.25') { + stage('v1.26') { agent { node { label 'ryzen-5950x-1' @@ -53,14 +53,14 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.v1_25 } + expression { params.v1_26 } } steps { - runRegressiontest('maintenance/v1.25', 'v1.25', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false) + runRegressiontest('maintenance/v1.26', 'v1.26', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false) } } - stage('v1.26') { + stage('v1.27') { agent { node { label 'ryzen-5950x-1' @@ -70,10 +70,10 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.v1_26 } + expression { params.v1_27 } } steps { - runRegressiontest('maintenance/v1.26', 'v1.26', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false) + runRegressiontest('maintenance/v1.27', 'v1.27', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false) } } @@ -128,7 +128,7 @@ pipeline { } } - stage('v1.25 FMI with OMSimulator') { + stage('v1.26 FMI with OMSimulator') { agent { node { label 'ryzen-5950x-2-1' @@ -138,13 +138,13 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.fmi_v1_25 } + expression { params.fmi_v1_26 } } steps { - runRegressiontest('maintenance/v1.25', 'v1.25-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + runRegressiontest('maintenance/v1.26', 'v1.26-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } - stage('v1.26 FMI with OMSimulator') { + stage('v1.27 FMI with OMSimulator') { agent { node { label 'ryzen-5950x-2-1' @@ -154,10 +154,10 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.fmi_v1_26 } + expression { params.fmi_v1_27 } } steps { - runRegressiontest('maintenance/v1.26', 'v1.26-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + runRegressiontest('maintenance/v1.27', 'v1.27-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } stage('master FMI with OMSimulator') { @@ -177,7 +177,7 @@ pipeline { } } - stage('v1.25 CVODE CS-FMUs with OMSimulator') { + stage('v1.26 CVODE CS-FMUs with OMSimulator') { agent { node { label 'ryzen-5950x-2-1' @@ -187,13 +187,13 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.cs_fmu_cvode_v1_25 } + expression { params.cs_fmu_cvode_v1_26 } } steps { - runRegressiontest('maintenance/v1.25', 'v1.25-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + runRegressiontest('maintenance/v1.26', 'v1.26-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } - stage('v1.26 CVODE CS-FMUs with OMSimulator') { + stage('v1.27 CVODE CS-FMUs with OMSimulator') { agent { node { label 'ryzen-5950x-2-1' @@ -203,10 +203,10 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.cs_fmu_cvode_v1_26 } + expression { params.cs_fmu_cvode_v1_27 } } steps { - runRegressiontest('maintenance/v1.26', 'v1.26-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + runRegressiontest('maintenance/v1.27', 'v1.27-cs-fmu-cvode', 'setCommandLineOptions("--fmiFlags=s:cvode --fmuRuntimeDepends=modelica")', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } stage('master CVODE CS-FMUs with OMSimulator') { @@ -226,7 +226,7 @@ pipeline { } } - stage('v1.25 FMI with FMPy') { + stage('v1.26 FMI with FMPy') { agent { node { label 'ryzen-5950x-2-1' @@ -236,14 +236,14 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.fmpy_fmi_v1_25 } + expression { params.fmpy_fmi_v1_26 } } steps { - runRegressiontest('maintenance/v1.25', 'v1.25-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + runRegressiontest('maintenance/v1.26', 'v1.26-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } - stage('v1.26 FMI with FMPy') { + stage('v1.27 FMI with FMPy') { agent { node { label 'ryzen-5950x-2-1' @@ -253,10 +253,10 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.fmpy_fmi_v1_26 } + expression { params.fmpy_fmi_v1_27 } } steps { - runRegressiontest('maintenance/v1.26', 'v1.26-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + runRegressiontest('maintenance/v1.27', 'v1.27-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } @@ -406,7 +406,7 @@ pipeline { } } - stage('C++ v1.25') { + stage('C++ v1.26') { agent { node { label 'ryzen-5950x-2-1' @@ -416,13 +416,13 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.cpp_v1_25 } + expression { params.cpp_v1_26 } } steps { - runRegressiontest('maintenance/v1.25', 'v1.25-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + runRegressiontest('maintenance/v1.26', 'v1.26-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } - stage('C++ v1.26') { + stage('C++ v1.27') { agent { node { label 'ryzen-5950x-2-1' @@ -432,10 +432,10 @@ pipeline { options { skipDefaultCheckout() } when { beforeAgent true - expression { params.cpp_v1_26 } + expression { params.cpp_v1_27 } } steps { - runRegressiontest('maintenance/v1.26', 'v1.26-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + runRegressiontest('maintenance/v1.27', 'v1.27-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } @@ -468,10 +468,10 @@ pipeline { } when { beforeAgent true - 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} + 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} } environment { - 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' + 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' PYTHONIOENCODING = 'utf-8' IDA_EMAIL = credentials('IDA email') } @@ -530,14 +530,14 @@ pipeline { } when { beforeAgent true - 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} + 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} } environment { - 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' + 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' GITBRANCHES_NEWINST = 'oldInst' GITBRANCHES_DAE = 'newInst-daeMode' GITBRANCHES_NEWBACKEND_DAE = 'newBackend-daeMode' - 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' + 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' PYTHONIOENCODING = 'utf-8' IDA_EMAIL = credentials('IDA email') } diff --git a/README.md b/README.md index 520fc80..b3a94b4 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,7 @@ rm -rf $refdir/MAP-LIB_ReferenceResults/ test -f MAP-LIB_ReferenceResults.git/config || git clone --bare https://github.com/modelica/MAP-LIB_ReferenceResults.git MAP-LIB_ReferenceResults.git cd MAP-LIB_ReferenceResults.git git fetch origin '*:*' -git fetch --tags +git fetch --tags --force for tag in $(git for-each-ref --format="%(refname:lstrip=-1)" refs/heads/) do