| commit | c65772a0564c816ff1f57bcc465a96505f9427a9 | [log] [tgz] |
|---|---|---|
| author | Dmitry Tyzhnenko <t.dmitry@gmail.com> | Wed May 22 08:02:24 2019 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Wed May 22 08:02:24 2019 +0000 |
| tree | 5a4a15afc4131ffa13562cc4c58f6bd0ce4a52e9 | |
| parent | 390af9339f8c1dc9d7f33723bdca5525ea903d3f [diff] | |
| parent | e8ddc24514130c688a1d266cad8a5380f42ca071 [diff] |
Merge "Test: add vsrx; disable tenant dhcp"
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml index ce60085..213ca41 100644 --- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml +++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -364,4 +364,5 @@ octavia_lb_mgmt_allocation_pool_start: 192.168.1.2 octavia_lb_mgmt_allocation_pool_end: 192.168.1.200 cinder_backup_engine: 'ceph' - cinder_ceph_backup_pool_name: 'backups' \ No newline at end of file + cinder_ceph_backup_pool_name: 'backups' + jenkins_pipelines_branch: 'release/2019.2.0' \ No newline at end of file
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml index 2ae3fb9..b05f2fd 100644 --- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml +++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -365,4 +365,5 @@ octavia_lb_mgmt_allocation_pool_start: 192.168.1.2 octavia_lb_mgmt_allocation_pool_end: 192.168.1.200 cinder_backup_engine: 'ceph' - cinder_ceph_backup_pool_name: 'backups' \ No newline at end of file + cinder_ceph_backup_pool_name: 'backups' + jenkins_pipelines_branch: 'release/2019.2.0' \ No newline at end of file