diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index 2891d0e..b35b254 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -381,7 +381,7 @@ pipeline { 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.v1_24 || 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 maintenance/v1.23 maintenance/v1.24 master newInst-newBackend heavy_tests' + 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' PYTHONIOENCODING = 'utf-8' IDA_EMAIL = credentials('IDA email') } @@ -400,7 +400,7 @@ pipeline { sh 'wget -q https://libraries.openmodelica.org/sqlite3/ripper1/sqlite3.db' sh './clean-empty-omcversion-dates.py' - sh "./all-reports.py --email --omcgitdir=OpenModelica ${env.GITBRANCHES} conversion" + sh "./all-reports.py --email --omcgitdir=OpenModelica ${env.GITBRANCHES} conversion heavy_tests" sh "./all-plots.py ${env.GITBRANCHES}" sh "./report.py --branches='${env.GITBRANCHES}' configs/conf.json configs/conf-old.json configs/conf-nonstandard.json" diff --git a/.CI/installLibraries.mos b/.CI/installLibraries.mos index 4a549cc..c587ad9 100644 --- a/.CI/installLibraries.mos +++ b/.CI/installLibraries.mos @@ -32,7 +32,7 @@ end for; for l in { {"AES", "main"}, - {"AixLib", "development"}, + {"AixLib", "main"}, {"Annex60", ""}, {"BidiDCDC", ""}, {"BLDC", ""}, diff --git a/configs/conf.json b/configs/conf.json index ef69f1b..d615796 100644 --- a/configs/conf.json +++ b/configs/conf.json @@ -151,11 +151,6 @@ { "library":"AixLib" }, - { - "library":"AixLib", - "libraryVersion":"development", - "libraryVersionNameForTests":"latest" - }, { "library":"IBPSA", "libraryVersion":"master",