commit 772e123f3ac0ab6bfd80ec1f9cbc7a009c9b9b01
author Vasyl Saienko <vsaienko@mirantis.com> Mon Jul 23 14:42:24 2018 +0300
committer Vasyl Saienko <vsaienko@mirantis.com> Mon Jul 23 14:43:32 2018 +0300
tree 68596f62c8cd4216668b4c0c5bd05085a870e5fa
parent 58fbe59a4d43d9a976258441caa5158718a2c023

Set default RECLASS_VERSIOn to 1.5.4

Use 1.5.4 reclass version by default for
 * generate-cookiecutter-products
 * test-cookiecutter-reclass
 * test-salt-model-node

Change-Id: I1be11b12539959265f76688d11a84d3403c62004

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 703620d..49da827 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -13,6 +13,11 @@
 saltModelTesting = new com.mirantis.mk.SaltModelTesting()
 ssh = new com.mirantis.mk.Ssh()
 
+def reclassVersion = '1.5.4'
+if (common.validInputParam('RECLASS_VERSION')) {
+  reclassVersion = RECLASS_VERSION
+}
+
 timeout(time: 12, unit: 'HOURS') {
   node("python&&docker") {
     def templateEnv = "${env.WORKSPACE}/template"
@@ -178,7 +183,7 @@
               testEnv,
               'pkg',
               'stable',
-              'master',
+              reclassVersion,
               0,
               false,
               false,

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 5fe02db..d11f7d4 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -4,6 +4,11 @@
 python = new com.mirantis.mk.Python()
 saltModelTesting = new com.mirantis.mk.SaltModelTesting()
 
+def reclassVersion = '1.5.4'
+if (common.validInputParam('RECLASS_VERSION')) {
+  reclassVersion = RECLASS_VERSION
+}
+
 def generateSaltMaster(modEnv, clusterDomain, clusterName) {
     def nodeFile = "${modEnv}/nodes/cfg01.${clusterDomain}.yml"
     def nodeString = """classes:
@@ -101,7 +106,7 @@
       testEnv,
       'pkg',
       DISTRIB_REVISION,
-      'master',
+      reclassVersion,
       0,
       false,
       false,

test-salt-model-node.groovy

diff --git a/test-salt-model-node.groovy b/test-salt-model-node.groovy
index 9b31168..9144bd3 100644
--- a/test-salt-model-node.groovy
+++ b/test-salt-model-node.groovy
@@ -29,6 +29,11 @@
 
 def checkouted = false
 
+def reclassVersion = '1.5.4'
+if (common.validInputParam('RECLASS_VERSION')) {
+  reclassVersion = RECLASS_VERSION
+}
+
 throttle(['test-model']) {
   timeout(time: 1, unit: 'HOURS') {
     node("python&&docker") {
@@ -73,7 +78,7 @@
                   workspace,
                   FORMULAS_SOURCE,
                   FORMULAS_REVISION,
-                  RECLASS_VERSION,
+                  reclassVerstion,
                   MAX_CPU_PER_JOB.toInteger(),
                   RECLASS_IGNORE_CLASS_NOTFOUND,
                   LEGACY_TEST_MODE,