From f1d65597bebe83a810290f772e012c12ca7ac441 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Wed, 10 Apr 2024 18:10:46 +0200 Subject: [PATCH] add v1.23 to testing (#99) --- .CI/Jenkinsfile | 81 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index 0a39ea5..1dbb1f9 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -13,6 +13,7 @@ pipeline { booleanParam(name: 'v1_20', defaultValue: false, description: 'maintenance/v1.20 branch (ryzen-5950x-1)') booleanParam(name: 'v1_21', defaultValue: false, description: 'maintenance/v1.21 branch (ryzen-5950x-1)') booleanParam(name: 'v1_22', defaultValue: false, description: 'maintenance/v1.22 branch (ryzen-5950x-1)') + booleanParam(name: 'v1_23', defaultValue: false, description: 'maintenance/v1.23 branch (ryzen-5950x-1)') booleanParam(name: 'master', defaultValue: false, description: 'master branch (ryzen-5950x-1)') booleanParam(name: 'fmi_v1_12', defaultValue: false, description: 'maintenance/v1.12 branch with FMI (ryzen-5950x-2)') @@ -25,8 +26,10 @@ pipeline { booleanParam(name: 'fmi_v1_20', defaultValue: false, description: 'maintenance/v1.20 branch with FMI (ryzen-5950x-2)') booleanParam(name: 'fmi_v1_21', defaultValue: false, description: 'maintenance/v1.21 branch with FMI (ryzen-5950x-2)') booleanParam(name: 'fmi_v1_22', defaultValue: false, description: 'maintenance/v1.22 branch with FMI (ryzen-5950x-2)') + booleanParam(name: 'fmi_v1_23', defaultValue: false, description: 'maintenance/v1.23 branch with FMI (ryzen-5950x-2)') booleanParam(name: 'fmi_master', defaultValue: false, description: 'master branch with FMI running OMSimulator (ryzen-5950x-2)') booleanParam(name: 'fmpy_fmi_v1_22', defaultValue: false, description: 'maintenance/v1.22 branch with FMI (ryzen-5950x-2)') + booleanParam(name: 'fmpy_fmi_v1_23', defaultValue: false, description: 'maintenance/v1.23 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)') booleanParam(name: 'newInst_newBackend', defaultValue: false, description: 'master branch, -d=newInst --newBackend, (ryzen-5950x-1)') @@ -36,6 +39,7 @@ pipeline { booleanParam(name: 'cpp_v1_20', defaultValue: false, description: 'maintenance/v1.20 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).') booleanParam(name: 'cpp_v1_21', defaultValue: false, description: 'maintenance/v1.21 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).') booleanParam(name: 'cpp_v1_22', defaultValue: false, description: 'maintenance/v1.22 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).') + booleanParam(name: 'cpp_v1_23', defaultValue: false, description: 'maintenance/v1.23 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') @@ -222,6 +226,23 @@ pipeline { } } + stage('v1.23') { + agent { + node { + label 'ryzen-5950x-1' + customWorkspace 'ws/OpenModelicaLibraryTestingWork' + } + } + options { skipDefaultCheckout() } + when { + beforeAgent true + expression { params.v1_23 } + } + steps { + runRegressiontest('maintenance/v1.23', 'v1.23', '', '', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false) + } + } + stage('master') { agent { node { @@ -433,6 +454,22 @@ pipeline { runRegressiontest('maintenance/v1.22', 'v1.22-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } + stage('v1.23 FMI with OMSimulator') { + agent { + node { + label 'ryzen-5950x-2-1' + customWorkspace 'ws/OpenModelicaLibraryTestingWork' + } + } + options { skipDefaultCheckout() } + when { + beforeAgent true + expression { params.fmi_v1_23 } + } + steps { + runRegressiontest('maintenance/v1.23', 'v1.23-fmi', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + } + } stage('master FMI with OMSimulator') { agent { node { @@ -465,6 +502,22 @@ pipeline { runRegressiontest('maintenance/v1.22', 'v1.22-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } + stage('v1.23 FMI with FMPy') { + agent { + node { + label 'ryzen-5950x-2-1' + customWorkspace 'ws/OpenModelicaLibraryTestingWork' + } + } + options { skipDefaultCheckout() } + when { + beforeAgent true + expression { params.fmpy_fmi_v1_23 } + } + steps { + runRegressiontest('maintenance/v1.23', 'v1.23-fmi-fmpy', '', omsimulatorHash(), 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + } + } stage('master FMI with FMPy') { agent { node { @@ -657,6 +710,22 @@ pipeline { runRegressiontest('maintenance/v1.22', 'v1.22-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) } } + stage('C++ v1.23') { + agent { + node { + label 'ryzen-5950x-2-1' + customWorkspace 'ws/OpenModelicaLibraryTestingWork' + } + } + options { skipDefaultCheckout() } + when { + beforeAgent true + expression { params.cpp_v1_23 } + } + steps { + runRegressiontest('maintenance/v1.23', 'v1.23-cpp', 'setCommandLineOptions("--simCodeTarget=Cpp")', '', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false) + } + } stage('C++') { agent { node { @@ -686,10 +755,10 @@ pipeline { } when { beforeAgent true - expression { params.v1_12 || params.v1_13 || params.v1_14 || params.v1_16 || params.v1_17 || params.v1_18 || params.v1_19 || params.v1_20 || params.v1_21 || params.v1_22 || params.master || params.conversion_script || params.report_ryzen_5950x_1 | params.newInst_newBackend || params.generateSymbolicJacobian || params.heavy_tests} + expression { params.v1_12 || params.v1_13 || params.v1_14 || params.v1_16 || params.v1_17 || params.v1_18 || params.v1_19 || params.v1_20 || params.v1_21 || params.v1_22 || params.v1_23 || params.master || params.conversion_script || params.report_ryzen_5950x_1 | params.newInst_newBackend || params.generateSymbolicJacobian || params.heavy_tests} } environment { - 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 master newInst-newBackend' + 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 master newInst-newBackend' PYTHONIOENCODING = 'utf-8' IDA_EMAIL = credentials('IDA email') } @@ -745,13 +814,13 @@ pipeline { } when { beforeAgent true - expression { params.fmi_v1_12 || params.fmi_v1_13 || params.fmi_v1_14 || params.fmi_v1_16 || params.fmi_v1_17 || params.fmi_v1_18 || params.fmi_v1_19 || params.fmi_v1_20 || params.fmi_v1_21 || params.fmi_v1_22 ||params.fmi_master || params.newInst_daeMode || params.oldInst || params.report_ryzen_5950x_2 || params.cpp || params.cvode || params.gbode} + expression { params.fmi_v1_12 || params.fmi_v1_13 || params.fmi_v1_14 || params.fmi_v1_16 || params.fmi_v1_17 || params.fmi_v1_18 || params.fmi_v1_19 || params.fmi_v1_20 || params.fmi_v1_21 || params.fmi_v1_22 || params.fmi_v1_23 || params.fmi_master || params.newInst_daeMode || params.oldInst || params.report_ryzen_5950x_2 || params.cpp || params.cvode || params.gbode} } environment { - 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 master-fmi maintenance/v1.22-fmi-fmpy master-fmi-fmpy' + 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 master-fmi maintenance/v1.22-fmi-fmpy maintenance/v1.23-fmi-fmpy master-fmi-fmpy' GITBRANCHES_NEWINST = 'oldInst' GITBRANCHES_DAE = 'newInst-daeMode' - GITBRANCHES_CPP = 'v1.19-cpp v1.20-cpp v1.21-cpp v1.22-cpp cpp' + GITBRANCHES_CPP = 'v1.19-cpp v1.20-cpp v1.21-cpp v1.22-cpp v1.23-cpp cpp' PYTHONIOENCODING = 'utf-8' IDA_EMAIL = credentials('IDA email') } @@ -841,7 +910,7 @@ pipeline { } when { beforeAgent true - expression { params.fmi_v1_12 || params.fmi_v1_13 || params.fmi_v1_14 || params.fmi_v1_16 || params.fmi_v1_17 || params.fmi_v1_18 || params.fmi_v1_18 || params.fmi_v1_19 || params.fmi_v1_20 || params.fmi_v1_21 || params.fmi_v1_22 || params.fmi_master || params.fmpy_fmi_v1_22 || params.fmpy_fmi_master || params.newInst_daeMode || params.oldInst || params.report_ripper2 } + expression { params.fmi_v1_12 || params.fmi_v1_13 || params.fmi_v1_14 || params.fmi_v1_16 || params.fmi_v1_17 || params.fmi_v1_18 || params.fmi_v1_18 || params.fmi_v1_19 || params.fmi_v1_20 || params.fmi_v1_21 || params.fmi_v1_22 || params.fmi_v1_23 || params.fmi_master || params.fmpy_fmi_v1_22 || params.fmpy_fmi_v1_23 || params.fmpy_fmi_master || params.newInst_daeMode || params.oldInst || params.report_ripper2 } } steps { sh 'cp ~/TEST_LIBS_BACKUP/ripper2-sqlite3.db sqlite3.db'