Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions .CI/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pipeline {
booleanParam(name: 'conversion_script', defaultValue: false, description: 'master branch with conversion script from MSL 3 to 4 (ryzen-5950x-1). This is an experimental job that does not run on a fixed schedule.')
booleanParam(name: 'solvers', defaultValue: false, description: 'master branch, simulated with -s cvode, -s gbode and -s ida (ryzen-9950x). This is an experimental job that does not run on a fixed schedule.')
booleanParam(name: 'dataReconciliation', defaultValue: false, description: 'master branch, the data reconciliation libraries of configs/dataReconciliation.json run with -reconcile (ryzen-5950x-1). Their reports are linked as (dr) and the job fills overview-dataReconciliation.html.')
booleanParam(name: 'dataReconciliation_newBackend', defaultValue: false, description: 'master branch, the data reconciliation libraries run with -reconcile and --newBackend, configs/dataReconciliation-newBackend.json (ryzen-5950x-1). Fills dataReconciliation-newBackend, which overview-dataReconciliation.html compares with dataReconciliation.')
booleanParam(name: 'generateSymbolicJacobian', defaultValue: false, description: 'master branch, with --generateSymbolicJacobian (ryzen-5950x-1). This is an experimental job that does not run on a fixed schedule.')
booleanParam(name: 'wasm_jit', defaultValue: false, description: 'master branch, with --simCodeTarget=wasm-jit (ryzen-9950x). Every model is translated and simulated the way simulate() does, filling wasm-jit. This is an experimental job that does not run on a fixed schedule.')
booleanParam(name: 'wasm_web', defaultValue: false, description: 'master branch, with --simCodeTarget=wasm-jit (ryzen-9950x), simulated the way the web omc does: the driver and the linear and nonlinear solvers in wasm, the in-wasm libm, and external "C" only from prebuilt wasm libraries. Fills wasm-web. This is an experimental job that does not run on a fixed schedule.')
Expand Down Expand Up @@ -416,6 +417,22 @@ pipeline {
runRegressiontest('master', 'dataReconciliation', '', '', false, '', '', false, false, 0, 'configs/dataReconciliation.json')
}
}
stage('dataReconciliation-newBackend') {
agent {
node {
label 'ryzen-5950x-1'
customWorkspace 'ws/OpenModelicaLibraryTestingWork'
}
}
options { skipDefaultCheckout() }
when {
beforeAgent true
expression { params.dataReconciliation_newBackend }
}
steps {
runRegressiontest('master', 'dataReconciliation-newBackend', '', '', false, '', '', false, false, 0, 'configs/dataReconciliation-newBackend.json')
}
}
stage('heavy_tests') {
agent {
node {
Expand Down Expand Up @@ -511,7 +528,7 @@ pipeline {
}
when {
beforeAgent true
expression { params.v1_25 || params.v1_26 || params.v1_27 || params.master || params.conversion_script || params.report_ryzen_5950x_1 || params.report_ryzen_5950x_2 || params.newInst_newBackend || params.generateSymbolicJacobian || params.dataReconciliation || params.heavy_tests || params.heavy_tests_wasm || params.fmi_v1_25 || params.fmi_v1_26 || params.fmi_v1_27 || params.fmi_master || params.newInst_daeMode || params.newBackend_daeMode || params.oldInst || params.cpp || params.solvers || params.wasm_jit || params.wasm_fmu || params.wasm_web || params.c_plus_rust}
expression { params.v1_25 || params.v1_26 || params.v1_27 || params.master || params.conversion_script || params.report_ryzen_5950x_1 || params.report_ryzen_5950x_2 || params.newInst_newBackend || params.generateSymbolicJacobian || params.dataReconciliation || params.dataReconciliation_newBackend || params.heavy_tests || params.heavy_tests_wasm || params.fmi_v1_25 || params.fmi_v1_26 || params.fmi_v1_27 || params.fmi_master || params.newInst_daeMode || params.newBackend_daeMode || params.oldInst || params.cpp || params.solvers || params.wasm_jit || params.wasm_fmu || params.wasm_web || params.c_plus_rust}
}
environment {
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'
Expand Down Expand Up @@ -544,8 +561,8 @@ pipeline {

// The shell takes extraEmails from the environment, so its value is never
// part of the command.
sh "./all-reports.py --email --extra-emails=\"\$extraEmails\" --omcgitdir=OpenModelica ${env.GITBRANCHES} ${env.GITBRANCHES_FMI} ${env.GITBRANCHES_NEWINST} ${env.GITBRANCHES_DAE} ${env.GITBRANCHES_NEWBACKEND_DAE} ${env.GITBRANCHES_CPP} ${env.GITBRANCHES_WASM_JIT} ${env.GITBRANCHES_C_PLUS_RUST} conversion heavy_tests heavy_tests_wasm generateSymbolicJacobian dataReconciliation gbode cvode ida"
sh "./all-plots.py ${env.GITBRANCHES} ${env.GITBRANCHES_FMI} ${env.GITBRANCHES_NEWINST} ${env.GITBRANCHES_DAE} ${env.GITBRANCHES_NEWBACKEND_DAE} ${env.GITBRANCHES_CPP} ${env.GITBRANCHES_WASM_JIT} ${env.GITBRANCHES_C_PLUS_RUST} conversion heavy_tests heavy_tests_wasm generateSymbolicJacobian dataReconciliation gbode cvode ida"
sh "./all-reports.py --email --extra-emails=\"\$extraEmails\" --omcgitdir=OpenModelica ${env.GITBRANCHES} ${env.GITBRANCHES_FMI} ${env.GITBRANCHES_NEWINST} ${env.GITBRANCHES_DAE} ${env.GITBRANCHES_NEWBACKEND_DAE} ${env.GITBRANCHES_CPP} ${env.GITBRANCHES_WASM_JIT} ${env.GITBRANCHES_C_PLUS_RUST} conversion heavy_tests heavy_tests_wasm generateSymbolicJacobian dataReconciliation dataReconciliation-newBackend gbode cvode ida"
sh "./all-plots.py ${env.GITBRANCHES} ${env.GITBRANCHES_FMI} ${env.GITBRANCHES_NEWINST} ${env.GITBRANCHES_DAE} ${env.GITBRANCHES_NEWBACKEND_DAE} ${env.GITBRANCHES_CPP} ${env.GITBRANCHES_WASM_JIT} ${env.GITBRANCHES_C_PLUS_RUST} conversion heavy_tests heavy_tests_wasm generateSymbolicJacobian dataReconciliation dataReconciliation-newBackend gbode cvode ida"

// Recorded and announced only once they are up: a report the database
// knows about is never generated again, so one that a later failure in
Expand Down Expand Up @@ -575,7 +592,7 @@ pipeline {
sh "./report.py --branches='generateSymbolicJacobian' configs/conf.json"
sh "mv overview.html overview-generateSymbolicJacobian.html"

sh "./report.py --branches='dataReconciliation' configs/dataReconciliation.json"
sh "./report.py --branches='dataReconciliation dataReconciliation-newBackend' configs/dataReconciliation.json"
sh "mv overview.html overview-dataReconciliation.html"

sh "./report.py --branches='heavy_tests heavy_tests_wasm' configs/heavy_tests.json"
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ different OpenModelica versions, according to the conditions of the
and the pages it links) is published in `files/<model>.dr/`, linked as
`(dr)` next to `(sim)`, with a *Data reconciliation* column in the library
page.
[configs/dataReconciliation-newBackend.json](./configs/dataReconciliation-newBackend.json)
is the same configuration with `--newBackend`; it fills the branch
`dataReconciliation-newBackend`, and `overview-dataReconciliation.html` has
a row for each of the two.

Check [configs/conf.json](./configs/conf.json) for more.
- If you used [.CI/installLibraries.mos](./.CI/installLibraries.mos) to test all
Expand Down
18 changes: 18 additions & 0 deletions configs/dataReconciliation-newBackend.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[
{
"library": "ModelicaDataReconciliationSimpleTests",
"libraryVersion": "master",
"libraryVersionNameForTests": "",
"dataReconciliation": true,
"extraCustomCommands": ["setCommandLineOptions(\"--newBackend --preOptModules+=dataReconciliation\")"],
"extraSimFlags": "-reconcile"
},
{
"library": "TSP_DataReconciliationSimpleTests",
"libraryVersion": "master",
"libraryVersionNameForTests": "",
"dataReconciliation": true,
"extraCustomCommands": ["setCommandLineOptions(\"--newBackend --preOptModules+=dataReconciliation\")"],
"extraSimFlags": "-reconcile"
}
]
Loading