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
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']
])