diff --git a/Jenkinsfile b/Jenkinsfile index 5946185..d83ddde 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,32 +46,35 @@ def resolveImageCommit(String image) { } def runRegressionLane(String image, String simulatorPath, boolean allowFailure, List suiteNames, List presetNames) { - def parallelTasks = [:] - - for (String suite : suiteNames) { - for (String preset : presetNames) { - def suiteName = suite - def presetName = preset - def taskName = "${suiteName}-${presetName}" - parallelTasks[taskName] = { - if (allowFailure) { - catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { - runOneRegression(suiteName, presetName, simulatorPath) - } - } else { - runOneRegression(suiteName, presetName, simulatorPath) - } - } - } - } - docker.image(image).inside { sh ''' set -eu cmake --version ctest --version ''' - parallel parallelTasks + + for (String suite : suiteNames) { + def suiteName = suite + def parallelTasks = [:] + + for (String preset : presetNames) { + def presetName = preset + def taskName = "${suiteName}-${presetName}" + parallelTasks[taskName] = { + if (allowFailure) { + catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') { + runOneRegression(suiteName, presetName, simulatorPath) + } + } else { + runOneRegression(suiteName, presetName, simulatorPath) + } + } + } + + stage("${suiteName} Suite") { + parallel parallelTasks + } + } } }