commit 458278ce24713e940c63b52ec2ee562a90df7780
author azvyagintsev <azvyagintsev@mirantis.com> Tue Sep 25 18:38:30 2018 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Tue Sep 25 19:16:53 2018 +0300
tree 5561ff3a6dae096d58ad1004deef96792ebd36af
parent 7cdcc7a84558c3f4fceb532fb98cd2c158392bdb

fix logic for branch tests

  * generate-cookiecutter-products.groovy
    Fix variable name
  * test-cookiecutter-reclass.groovy
    - Fix 'proposed' fallback check

Change-Id: Icbbeaa54e303938d7bb70a8e3198618737762ca9

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 5cc1689..e1cd638 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -111,7 +111,7 @@
                 if (product.startsWith("stacklight") && (!fileExists(templateDir))) {
                     common.warningMsg("Old release detected! productDir => 'stacklight2' ")
                     productDir = "stacklight2"
-                    templateDir = "${templateEnvDir}/cluster_product/${productDir}"
+                    templateDir = "${templateEnv}/cluster_product/${productDir}"
                 }
 
                 if (product == "infra" || (templateContext.default_context["${product}_enabled"]