commit 197f6117d50b4b2171df53c438567fe154a97d45
author Michal Kobus <mkobus@mirantis.com> Fri Sep 21 14:30:16 2018 +0200
committer Aleksey Zvyagintsev <azvyagintsev@mirantis.com> Fri Sep 21 13:07:45 2018 +0000
tree 7172501339dec9898243ae51b1384094c95c81fa
parent 806664d33c7f8013a20e20e8183714600ae6f036

Remove stacklight1

Change-Id: Iab6b294f4e61b4871d2d8cae927bc02211700f84
Closes-bug: PROD-22224 (PROD:22224)

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 6e65f5e..8dfb6e9 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -104,26 +104,8 @@
             for (product in productList) {
 
                 // get templateOutputDir and productDir
-                if (product.startsWith("stacklight")) {
-                    templateOutputDir = "${env.WORKSPACE}/output/stacklight"
-
-                    def stacklightVersion
-                    try {
-                        stacklightVersion = templateContext.default_context['stacklight_version']
-                    } catch (Throwable e) {
-                        common.warningMsg('Stacklight version loading failed')
-                    }
-
-                    if (stacklightVersion) {
-                        productDir = "stacklight" + stacklightVersion
-                    } else {
-                        productDir = "stacklight1"
-                    }
-
-                } else {
-                    templateOutputDir = "${env.WORKSPACE}/output/${product}"
-                    productDir = product
-                }
+                templateOutputDir = "${env.WORKSPACE}/output/${product}"
+                productDir = product
 
                 if (product == "infra" || (templateContext.default_context["${product}_enabled"]
                     && templateContext.default_context["${product}_enabled"].toBoolean())) {

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 674d70c..5184926 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -100,17 +100,8 @@
         for (product in productList) {
 
             // get templateOutputDir and productDir
-            if (product.startsWith("stacklight")) {
-                templateOutputDir = "${templateEnvDir}/output/stacklight"
-                try {
-                    productDir = "stacklight" + templateContext.default_context['stacklight_version']
-                } catch (Throwable e) {
-                    productDir = "stacklight1"
-                }
-            } else {
-                templateOutputDir = "${templateEnvDir}/output/${product}"
-                productDir = product
-            }
+            templateOutputDir = "${templateEnvDir}/output/${product}"
+            productDir = product
 
             if (product == "infra" || (templateContext.default_context["${product}_enabled"]
                 && templateContext.default_context["${product}_enabled"].toBoolean())) {