Use parameter parallel_node_group in salt-models testing
Change-Id: I7b4687b22afd1404cb4a971d0f81ff91fa6e69a4
diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index 82685dd..694ddba 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -64,7 +64,7 @@
def nodes = sh(script: "find ./nodes -type f -name 'cfg*.yml'", returnStdout: true).tokenize()
def buildSteps = [:]
if(nodes.size() > 1){
- if(nodes.size() <= 3){
+ if(nodes.size() <= 3 && PARALLEL_NODE_GROUP_SIZE.toInteger() != 1) {
common.infoMsg("Found <=3 cfg nodes, running parallel test")
for(int i=0; i < nodes.size();i++){
def basename = sh(script: "basename ${partition[k]} .yml", returnStdout: true).trim()
@@ -72,8 +72,8 @@
}
parallel buildSteps
}else{
- common.infoMsg("Found more than 3 cfg nodes, running parallel group test with 3 nodes")
- def partitions = common.partitionList(nodes, 3)
+ common.infoMsg("Found more than 3 cfg nodes, running parallel group test with PARALLEL_NODE_GROUP_SIZE nodes")
+ def partitions = common.partitionList(nodes, PARALLEL_NODE_GROUP_SIZE.toInteger())
for (int i=0; i < partitions.size();i++) {
def partition = partitions[i]
buildSteps.put("partition-${i}", new HashMap<String,org.jenkinsci.plugins.workflow.cps.CpsClosure2>())