commit 46b7bbcb54c28bd4a0aa576e484fb559dc5e97ff
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Tue Oct 30 22:32:13 2018 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Wed Oct 31 12:17:16 2018 +0400
tree 42899c442b4b0ba44bde3ffc4c2a80c3466298dd
parent 1edde6baff5708977256accf4fab71aa8ae98302

Several fixes for generate-salt-model and deploy-trymcp jobs

* Fix default credentials for gerrit
* Add ability to override hard-coded mcp_common_scripts repo
* Fix credentials for salt
Change-Id: Iaf344b0c34408c779b68e4f8f1e61ff9d39fadd2

deploy-try-mcp.groovy

diff --git a/deploy-try-mcp.groovy b/deploy-try-mcp.groovy
index 0b1777c..a2698b7 100644
--- a/deploy-try-mcp.groovy
+++ b/deploy-try-mcp.groovy
@@ -64,7 +64,7 @@
         }
 
         stage("Setup virtualenv for Pepper") {
-          python.setupPepperVirtualenv(pepperEnv, masterUrl, "salt-qa-credentials")
+          python.setupPepperVirtualenv(pepperEnv, masterUrl, SALT_MASTER_CREDENTIALS)
         }
 
         stage("Prepare AIO node"){
@@ -95,7 +95,7 @@
         stage("Deploy Openstack") {
           build(job: 'deploy_openstack',
                 parameters: [
-                  [$class: 'StringParameterValue', name: 'SALT_MASTER_CREDENTIALS', value: "salt-qa-credentials"],
+                  [$class: 'StringParameterValue', name: 'SALT_MASTER_CREDENTIALS', value: SALT_MASTER_CREDENTIALS],
                   [$class: 'StringParameterValue', name: 'SALT_MASTER_URL', value: masterUrl],
                   [$class: 'StringParameterValue', name: 'STACK_INSTALL', value: 'openstack']
                 ])

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index 2ea7604..fb28837 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -14,7 +14,7 @@
 
 
 slaveNode = env.SLAVE_NODE ?: 'python&&docker'
-gerritCredentials = env.CREDENTIALS_ID ?: 'mcp-ci-gerrit'
+gerritCredentials = env.CREDENTIALS_ID ?: 'gerrit'
 
 timeout(time: 2, unit: 'HOURS') {
     node(slaveNode) {
@@ -147,7 +147,7 @@
                             mcpCommonScriptsBranch = 'master'
                         }
                     }
-                    def commonScriptsRepoUrl = 'ssh://gerrit.mcp.mirantis.com:29418/mcp/mcp-common-scripts'
+                    def commonScriptsRepoUrl = templateContext['default_context']['mcp_common_scripts_repo'] ?: 'ssh://gerrit.mcp.mirantis.com:29418/mcp/mcp-common-scripts'
                     checkout([
                         $class           : 'GitSCM',
                         branches         : [[name: 'FETCH_HEAD'],],