@@ -513,41 +513,6 @@ pipeline {
513513 }
514514 }
515515 } }
516- stage(' cleanup' ) { parallel {
517- // The cleanup is needed because we can't save the cleanup done in the report stage
518- stage(' ripper1' ) {
519- agent {
520- node {
521- label ' ryzen-5950x-1'
522- }
523- }
524- when {
525- beforeAgent true
526- expression { params. v1_23 || params. v1_24 || params. master || params. report_ripper1 || params. generateSymbolicJacobian }
527- }
528- steps {
529- sh ' cp ~/TEST_LIBS_BACKUP/ripper1-sqlite3.db sqlite3.db'
530- sh ' ./clean-empty-omcversion-dates.py'
531- sh ' cp sqlite3.db ~/TEST_LIBS_BACKUP/ripper1-sqlite3.db'
532- }
533- }
534- stage(' ripper2' ) {
535- agent {
536- node {
537- label ' ryzen-5950x-2-1'
538- }
539- }
540- when {
541- beforeAgent true
542- expression { params. fmi_v1_23 || params. fmi_v1_24 || params. fmi_master || params. fmpy_fmi_v1_23 || params. fmpy_fmi_v1_24 || params. fmpy_fmi_master || params. newInst_daeMode || params. oldInst || params. report_ripper2 }
543- }
544- steps {
545- sh ' cp ~/TEST_LIBS_BACKUP/ripper2-sqlite3.db sqlite3.db'
546- sh ' ./clean-empty-omcversion-dates.py'
547- sh ' cp sqlite3.db ~/TEST_LIBS_BACKUP/ripper2-sqlite3.db'
548- }
549- }
550- } }
551516 }
552517}
553518def omsimulatorHash () {
@@ -814,10 +779,9 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
814779 sh ' date'
815780 sh " rm -f OpenModelicaLibraryTesting/${ dbPrefix} -sqlite3.db.tmp"
816781 sh " ln OpenModelicaLibraryTesting/sqlite3.db OpenModelicaLibraryTesting/${ dbPrefix} -sqlite3.db.tmp"
817-
782+ sh " cd OpenModelicaLibraryTesting/sqlite3.db && ./clean-empty-omcversion-dates.py "
818783 sh " cp OpenModelicaLibraryTesting/sqlite3.db ~/TEST_LIBS_BACKUP/${ dbPrefix} -sqlite3.db"
819784 sh " rm -f ~/TEST_LIBS_BACKUP/${ dbPrefix} -`date +sqlite3.%Y%m%d.db`"
820785
821- sshPublisher(publishers : [sshPublisherDesc(configName : sshConfig, transfers : [sshTransfer(removePrefix : ' OpenModelicaLibraryTesting' , sourceFiles : ' OpenModelicaLibraryTesting/sqlite3.db' )])], failOnError : true )
822-
786+ sshPublisher(publishers : [sshPublisherDesc(configName : sshConfig, transfers : [sshTransfer(removePrefix : ' OpenModelicaLibraryTesting' , sourceFiles : ' OpenModelicaLibraryTesting/sqlite3.db' )])], failOnError : true )
823787}
0 commit comments