Merge "Add OS_ variables to released_* deployments"
diff --git a/jobs/pipelines/rotation-released-deployment.groovy b/jobs/pipelines/rotation-released-deployment.groovy
index 88bb73a..7ae04bc 100644
--- a/jobs/pipelines/rotation-released-deployment.groovy
+++ b/jobs/pipelines/rotation-released-deployment.groovy
@@ -9,6 +9,7 @@
* OS_AUTH_URL OpenStack keystone catalog URL
* OS_PROJECT_NAME OpenStack project (tenant) name
* OS_CREDENTIALS OpenStack username and password credentials ID in Jenkins
+ * OS_USER_DOMAIN_NAME OpenStack domain
* TCP_QA_REFS Reference to the tcp-qa change on Gerrit, like refs/changes/46/418546/41
*/
@@ -53,7 +54,7 @@
export OS_USERNAME=${OS_USERNAME}
export OS_PASSWORD=${OS_PASSWORD}
export OS_PROJECT_NAME=${OS_PROJECT_NAME}
- export OS_USER_DOMAIN_NAME=ldap_mirantis
+ export OS_USER_DOMAIN_NAME=${OS_USER_DOMAIN_NAME}
openstack --insecure stack delete -y ${stack_name} || true
timeout 20m /bin/bash -c "while openstack --insecure stack show ${stack_name} -f value -c stack_status; do sleep 10; done";
""")
@@ -75,6 +76,9 @@
parameters: [
string(name: 'PARENT_NODE_NAME', value: env.PARENT_NODE_NAME),
string(name: 'OS_CREDENTIALS', value: env.OS_CREDENTIALS),
+ string(name: 'OS_AUTH_URL', value: env.OS_AUTH_URL),
+ string(name: 'OS_PROJECT_NAME', value: env.OS_PROJECT_NAME),
+ string(name: 'OS_USER_DOMAIN_NAME', value: env.OS_USER_DOMAIN_NAME),
string(name: 'TCP_QA_REFS', value: env.TCP_QA_REFS)
]
}
diff --git a/jobs/templates/deploy-released.yml b/jobs/templates/deploy-released.yml
index 4ddb1f4..2d809d9 100644
--- a/jobs/templates/deploy-released.yml
+++ b/jobs/templates/deploy-released.yml
@@ -8,11 +8,6 @@
- timed: H(20-30) 1 * * 1-5
name: deploy-released
parameters:
- - string:
- default: sre-qa-ci-eu
- description: ''
- name: OS_CREDENTIALS
- trim: 'false'
- text:
default: |-
released-heat-cicd-pike-contrail41-sl
@@ -32,6 +27,11 @@
name: PARENT_NODE_NAME
trim: 'false'
- string:
+ default: sre-qa-ci-eu
+ description: ''
+ name: OS_CREDENTIALS
+ trim: 'false'
+ - string:
default: https://ic-eu.ssl.mirantis.net:5000/v3
description: ''
name: OS_AUTH_URL
@@ -41,6 +41,11 @@
description: ''
name: OS_PROJECT_NAME
trim: 'false'
+ - string:
+ default: default
+ description: ''
+ name: OS_USER_DOMAIN_NAME
+ trim: 'false'
pipeline-scm:
lightweight-checkout: false
scm: