add bw for 'Remove stacklight1' patch
* Fix test issue, provided by
https://gerrit.mcp.mirantis.net/#/c/26534/
Change-Id: Id639ce700d562fccf2a23856fa4116afb1d74927
diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 8dfb6e9..5cc1689 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -106,11 +106,17 @@
// get templateOutputDir and productDir
templateOutputDir = "${env.WORKSPACE}/output/${product}"
productDir = product
+ templateDir = "${templateEnv}/cluster_product/${productDir}"
+ // Bw for 2018.8.1 and older releases
+ if (product.startsWith("stacklight") && (!fileExists(templateDir))) {
+ common.warningMsg("Old release detected! productDir => 'stacklight2' ")
+ productDir = "stacklight2"
+ templateDir = "${templateEnvDir}/cluster_product/${productDir}"
+ }
if (product == "infra" || (templateContext.default_context["${product}_enabled"]
&& templateContext.default_context["${product}_enabled"].toBoolean())) {
- templateDir = "${templateEnv}/cluster_product/${productDir}"
common.infoMsg("Generating product " + product + " from " + templateDir + " to " + templateOutputDir)
sh "rm -rf ${templateOutputDir} || true"
@@ -161,12 +167,12 @@
common.infoMsg("Attempt to run test against formula-version: ${mcpVersion}")
try {
def config = [
- 'dockerHostname': "${saltMaster}.${clusterDomain}",
- 'reclassEnv': testEnv,
- 'formulasRevision': mcpVersion,
- 'reclassVersion': reclassVersion,
+ 'dockerHostname' : "${saltMaster}.${clusterDomain}",
+ 'reclassEnv' : testEnv,
+ 'formulasRevision' : mcpVersion,
+ 'reclassVersion' : reclassVersion,
'dockerContainerName': DockerCName,
- 'testContext': 'salt-model-node'
+ 'testContext' : 'salt-model-node'
]
testResult = saltModelTesting.testNode(config)
common.infoMsg("Test finished: SUCCESS")
@@ -195,10 +201,10 @@
def commonScriptsRepoUrl = 'https://gerrit.mcp.mirantis.net/mcp/mcp-common-scripts'
checkout([
- $class: 'GitSCM',
- branches: [[name: 'FETCH_HEAD'],],
- extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'mcp-common-scripts']],
- userRemoteConfigs: [[url: commonScriptsRepoUrl, refspec: mcpCommonScriptsBranch],],
+ $class : 'GitSCM',
+ branches : [[name: 'FETCH_HEAD'],],
+ extensions : [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'mcp-common-scripts']],
+ userRemoteConfigs: [[url: commonScriptsRepoUrl, refspec: mcpCommonScriptsBranch],],
])
sh "cp mcp-common-scripts/config-drive/create_config_drive.sh create-config-drive && chmod +x create-config-drive"
diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 6e85801..becfb15 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -103,11 +103,16 @@
// get templateOutputDir and productDir
templateOutputDir = "${templateEnvDir}/output/${product}"
productDir = product
-
+ templateDir = "${templateEnvDir}/cluster_product/${productDir}"
+ // Bw for 2018.8.1 and older releases
+ if (product.startsWith("stacklight") && (!fileExists(templateDir))) {
+ common.warningMsg("Old release detected! productDir => 'stacklight2' ")
+ productDir = "stacklight2"
+ templateDir = "${templateEnvDir}/cluster_product/${productDir}"
+ }
if (product == "infra" || (templateContext.default_context["${product}_enabled"]
&& templateContext.default_context["${product}_enabled"].toBoolean())) {
- templateDir = "${templateEnvDir}/cluster_product/${productDir}"
common.infoMsg("Generating product " + product + " from " + templateDir + " to " + templateOutputDir)
sh "rm -rf ${templateOutputDir} || true"