commit f97aec28f4e93bfec6376acf8546419a1cf06b67
author Denis Egorenko <degorenko@mirantis.com> Tue Feb 05 14:57:33 2019 +0400
committer Denis Egorenko <degorenko@mirantis.com> Tue Feb 05 15:29:43 2019 +0400
tree 272eb002e54f3278bc35392bac2e5b4452b9e796
parent 49f16c0966bc13fc009765168743be958439d4d9

Fix deprecated local salt repo url for Generate products job

Change-Id: Iff49ba30d3f37a2b8d012b0367cd6d3e2ea066b9
Related-Prod: PROD-26605 (PROD:26605)

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 8dfcba4..1f86345 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -234,7 +234,11 @@
                 if (context['local_repositories'] == 'True') {
                     def localRepoIP = context['local_repo_url']
                     smc['MCP_SALT_REPO_KEY'] = "http://${localRepoIP}/public.gpg"
-                    smc['MCP_SALT_REPO_URL'] = "http://${localRepoIP}/ubuntu-xenial"
+                    if (context['mcp_version'] in ['2018.4.0', '2018.8.0', '2018.8.0-milestone1', '2018.11.0']) {
+                        smc['MCP_SALT_REPO_URL'] = "http://${localRepoIP}/ubuntu-xenial"
+                    } else {
+                        smc['MCP_SALT_REPO_URL'] = "http://${localRepoIP}"
+                    }
                     smc['PIPELINES_FROM_ISO'] = 'false'
                     smc['PIPELINE_REPO_URL'] = "http://${localRepoIP}:8088"
                     smc['LOCAL_REPOS'] = 'true'