Fix parameters for setupAndTestNode
Change-Id: Ibf8f6c2c63960bf1fd1f84e09eff13e5ace88ff0
diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index ccea1f4..3b6ee09 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -65,9 +65,21 @@
common.infoMsg("Running salt model test for node ${NODE_TARGET} in cluster ${CLUSTER_NAME}")
try {
def DockerCName = "${env.JOB_NAME.toLowerCase()}_${env.BUILD_TAG.toLowerCase()}"
- saltModelTesting.setupAndTestNode(NODE_TARGET, CLUSTER_NAME, EXTRA_FORMULAS, workspace, FORMULAS_SOURCE,
- FORMULAS_REVISION, RECLASS_VERSION, MAX_CPU_PER_JOB.toInteger(), RECLASS_IGNORE_CLASS_NOTFOUND,
- LEGACY_TEST_MODE, APT_REPOSITORY, APT_REPOSITORY_GPG, dockerContainerName: DockerCName)
+
+ saltModelTesting.setupAndTestNode(
+ NODE_TARGET,
+ CLUSTER_NAME,
+ EXTRA_FORMULAS,
+ workspace,
+ FORMULAS_SOURCE,
+ FORMULAS_REVISION,
+ RECLASS_VERSION,
+ MAX_CPU_PER_JOB.toInteger(),
+ RECLASS_IGNORE_CLASS_NOTFOUND,
+ LEGACY_TEST_MODE,
+ APT_REPOSITORY,
+ APT_REPOSITORY_GPG,
+ DockerCName)
} catch (Exception e) {
if (e.getMessage() == "script returned exit code 124") {
common.errorMsg("Impossible to test node due to timeout of salt-master, ABORTING BUILD")