commit c777bb8ac9dc8df122596e46dfc7981fa6326a69
author Vasyl Saienko <vsaienko@mirantis.com> Mon Jul 23 14:56:01 2018 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Mon Jul 23 14:56:01 2018 +0300
tree a88b67a72acfd03f812b831c9b5717e2b710b740
parent 772e123f3ac0ab6bfd80ec1f9cbc7a009c9b9b01

Fix passing reclassVersion to testModel

Change-Id: I74529548a557a64b665d44f1a8eb7b4ec417f561

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index d11f7d4..59c6dbd 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -81,7 +81,7 @@
     generateSaltMaster(generatedModel, clusterDomain, clusterName)
 }
 
-def testModel(modelFile, testEnv) {
+def testModel(modelFile, testEnv, reclassVersion='1.5.4') {
   def templateEnv = "${env.WORKSPACE}"
   def content = readFile(file: "${templateEnv}/contexts/${modelFile}.yml")
   def templateContext = readYaml text: content
@@ -192,7 +192,7 @@
                     for(part in partition){
                         def basename = sh(script: "basename ${part} .yml", returnStdout: true).trim()
                         def testEnv = "${env.WORKSPACE}/model/${basename}"
-                        buildSteps.get("partition-${i}").put(basename, { testModel(basename, testEnv) })
+                        buildSteps.get("partition-${i}").put(basename, { testModel(basename, testEnv, reclassVersion) })
                     }
                 }
                 common.serial(buildSteps)

test-salt-model-node.groovy

diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index 9144bd3..8674e46 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -78,7 +78,7 @@
                   workspace,
                   FORMULAS_SOURCE,
                   FORMULAS_REVISION,
-                  reclassVerstion,
+                  reclassVersion,
                   MAX_CPU_PER_JOB.toInteger(),
                   RECLASS_IGNORE_CLASS_NOTFOUND,
                   LEGACY_TEST_MODE,