From b2c22f9523c9bac38133879eb512503687d3abf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sj=C3=B6lund?= Date: Sun, 1 Nov 2026 15:54:30 +0100 Subject: [PATCH] Run the FMI jobs in the .CI/testing image The FMI stages passed '' as dockerfile, the old default they had to fill in to reach the fmiSimulators argument. Since #335 made .CI/testing the default, '' means opting out of the container, so the FMI jobs kept building omc on the node. master-fmi now fails there: OpenModelica#16864 makes cmake use the system minizip on Linux, and the node has no unzip.h. Assisted-by: Claude Opus 5.5 --- .CI/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index 4e89bdf..529d579 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -217,7 +217,7 @@ pipeline { expression { params.fmi_v1_26 } } steps { - runRegressiontest('maintenance/v1.26', 'v1.26-fmi', '', omsimulatorHash(), false, '', '', false, false, 0, 'configs/conf.json', '', '', fmiSimulators()) + runRegressiontest('maintenance/v1.26', 'v1.26-fmi', '', omsimulatorHash(), false, '', '', false, false, 0, 'configs/conf.json', '', '.CI/testing', fmiSimulators()) } } stage('v1.27 FMI') { @@ -233,7 +233,7 @@ pipeline { expression { params.fmi_v1_27 } } steps { - runRegressiontest('maintenance/v1.27', 'v1.27-fmi', '', omsimulatorHash(), false, '', '', false, false, 0, 'configs/conf.json', '', '', fmiSimulators()) + runRegressiontest('maintenance/v1.27', 'v1.27-fmi', '', omsimulatorHash(), false, '', '', false, false, 0, 'configs/conf.json', '', '.CI/testing', fmiSimulators()) } } stage('master FMI') { @@ -249,7 +249,7 @@ pipeline { expression { params.fmi_master } } steps { - runRegressiontest('master', 'master-fmi', '', 'origin/master', false, '', '', false, false, 0, 'configs/conf.json', '', '', fmiSimulators()) + runRegressiontest('master', 'master-fmi', '', 'origin/master', false, '', '', false, false, 0, 'configs/conf.json', '', '.CI/testing', fmiSimulators()) } }