commit a718b085dbc61eef0a0658c481698bac3fffb71e
author Jakub Josef <jakub.josef@gmail.com> Mon May 15 17:13:25 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Mon May 15 17:13:27 2017 +0000
tree 1d15e9d5e72a6c1daa502869b037240541b64c0e
parent 8e6949244244e95fba9b3d4313aad7478d782d42
parent 417bfded15656ce709468aeb1c785fa76fa94f7b

Merge "Fixed newline in parallel output"

test-salt-models-pipeline.groovy

diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index f2d2c33..2987314 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -70,8 +70,8 @@
           def partition = partitions[i]
           buildSteps.put("partition-${i}", new HashMap<String,org.jenkinsci.plugins.workflow.cps.CpsClosure2>())
           for(int k=0; k < partition.size;k++){
-              def basename = sh script: "basename ${partition[k]} .yml", returnStdout: true
-              buildSteps.get("partition-${i}").put(basename, { setupAndTestNode(basename.trim()) })
+              def basename = sh(script: "basename ${partition[k]} .yml", returnStdout: true).trim()
+              buildSteps.get("partition-${i}").put(basename, { setupAndTestNode(basename })
           }
         }
         common.serial(buildSteps)