Fix CC model for released-heat* envs
CC contexts for 'released-heat-cicd-pike-contrail41-sl'
and 'released-heat-cicd-pike-dvr-sl' envs were missing
jenkins_pipelines_branch variable. Consequently,
shared-salt.MACRO_GENERATE_COOKIECUTTER_MODEL macro was not
updating this variable with a value provided by
JENKINS_PIPELINE_BRANCH jenkins job param.
As a result jenkins_pipelines_branch model parameter of the
deployed env was set by cookiecutter-templates as:
jenkins_pipelines_branch: "release/${_param:mcp_version}"
Change-Id: Ibc7285607d7ed066c989af1702a10825d5317f46
Related-Prod:PROD-34612
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index d6cacd4..2bb3fd8 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -317,6 +317,7 @@
rabbitmq_ssl_enabled: 'True'
openstack_rabbitmq_x509_enabled: 'True'
openstack_internal_protocol: 'https'
+ jenkins_pipelines_branch: 'release/2019.2.0'
openstack_keystone_security:
disable_user_account_days_inactive: 7
lockout_failure_attempts: 60
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 902f640..0d0f1a8 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -365,6 +365,7 @@
octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
cinder_backup_engine: 'ceph'
cinder_ceph_backup_pool_name: 'backups'
+ jenkins_pipelines_branch: 'release/2019.2.0'
maas_enabled: 'True'
maas_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.15
maas_deploy_cidr: ==IPV4_NET_ADMIN_PREFIX==.0/24
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index 2026685..0307478 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -486,8 +486,8 @@
sed -i 's/mcp_version:.*/mcp_version: {{ REPOSITORY_SUITE }}/g' {{ CLUSTER_CONTEXT_PATH }}
{%- if JENKINS_PIPELINE_BRANCH != '' %}
# Escape / with \/
- escaped_branch=$(echo {{ JENKINS_PIPELINE_BRANCH }} | sed "s/\//\\\\\//g")
- sed -i "s/jenkins_pipelines_branch: .*/jenkins_pipelines_branch: $escaped_branch/g" {{ CLUSTER_CONTEXT_PATH }}
+ escaped_branch=$(echo {{ JENKINS_PIPELINE_BRANCH }} | sed s'/\//\\\//g')
+ sed -i "s/jenkins_pipelines_branch:.*/jenkins_pipelines_branch: '$escaped_branch'/g" {{ CLUSTER_CONTEXT_PATH }}
{%- endif %}
{%- if CONTROL_VLAN %}
sed -i 's/control_vlan: .*/control_vlan: {{ CONTROL_VLAN }}/g' {{ CLUSTER_CONTEXT_PATH }}