Merge "Revert "Fix path to Tempests's skiplist""
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
index 3458dbc..c09d859 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
@@ -305,6 +305,7 @@
openstack_message_queue_node03_address: 10.167.11.43
openstack_message_queue_node03_hostname: msg03
openstack_network_engine: ovs
+ openstack_ovs_dvr_enabled: 'False'
openstack_neutron_qos: 'True'
openstack_neutron_vlan_aware_vms: 'True'
openstack_nfv_dpdk_enabled: 'False'
@@ -316,7 +317,6 @@
openstack_nfv_sriov_pf_nic: enp5s0f1
openstack_nova_cpu_pinning: 6,7,8,9,10,11
openstack_nova_compute_reserved_host_memory_mb: '900'
- openstack_ovs_dvr_enabled: 'True'
openstack_ovs_encapsulation_type: vxlan
openstack_ovs_encapsulation_vlan_range: 2402:2406
openstack_proxy_address: 10.167.11.80
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 28d5916..026932b 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -190,7 +190,7 @@
devices:
- sdb
volume:
- cinder-volumes-pool:
+ cinder-vg-pool:
size: 800G
power_parameters:
power_address: "5.43.227.11"
@@ -243,7 +243,7 @@
devices:
- sdb
volume:
- cinder-volumes-pool:
+ cinder-vg-pool:
size: 800G
power_parameters:
power_address: "5.43.227.19"
@@ -263,10 +263,10 @@
openstack_cluster_size: compact
openstack_compute_count: '2'
openstack_compute_rack01_hostname: cmp
- openstack_compute_single_address_ranges: 10.167.11.15-10.167.11.16
+ openstack_compute_single_address_ranges: 10.167.11.15-10.167.11.254
openstack_compute_deploy_address_ranges: 172.16.162.73-172.16.162.74
- openstack_compute_tenant_address_ranges: 10.167.13.15-10.167.13.16
- openstack_compute_backend_address_ranges: 10.167.13.15-10.167.13.16
+ openstack_compute_tenant_address_ranges: 10.167.13.15-10.167.13.254
+ openstack_compute_backend_address_ranges: 10.167.13.15-10.167.13.254
openstack_control_address: 10.167.11.10
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.11.11
@@ -305,6 +305,7 @@
openstack_message_queue_node03_address: 10.167.11.43
openstack_message_queue_node03_hostname: msg03
openstack_network_engine: ovs
+ openstack_ovs_dvr_enabled: 'False'
openstack_neutron_qos: 'True'
openstack_neutron_vlan_aware_vms: 'True'
openstack_nfv_dpdk_enabled: 'False'
@@ -316,7 +317,6 @@
openstack_nfv_sriov_pf_nic: enp5s0f1
openstack_nova_cpu_pinning: 6,7,8,9,10,11
openstack_nova_compute_reserved_host_memory_mb: '900'
- openstack_ovs_dvr_enabled: 'True'
openstack_ovs_encapsulation_type: vxlan
openstack_ovs_encapsulation_vlan_range: 2402:2406
openstack_proxy_address: 10.167.11.80
diff --git a/tcp_tests/templates/e_lab_engineer b/tcp_tests/templates/e_lab_engineer
index 91bcf2f..1c1a7bf 100644
--- a/tcp_tests/templates/e_lab_engineer
+++ b/tcp_tests/templates/e_lab_engineer
@@ -1,5 +1,4 @@
176.74.217.64
-185.8.59.228
5.43.225.89
5.43.227.11
5.43.227.19
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
index c7f6ea6..6971e77 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
@@ -130,7 +130,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -678,7 +678,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
index 0c92b47..928d76f 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
@@ -127,7 +127,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -932,7 +932,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
index 1d24327..6319401 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
@@ -130,7 +130,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -678,7 +678,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay.hot
index 8fc50af..726ee09 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay.hot
@@ -127,7 +127,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -932,7 +932,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
index 95fc69e..07f30aa 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
@@ -130,7 +130,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -678,7 +678,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay.hot
index d9da3dd..4c12277 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay.hot
@@ -127,7 +127,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -932,7 +932,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
index 88997d7..a82aaf0 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay.hot
@@ -130,7 +130,7 @@
env_name: { get_param: env_name }
mcp_version: { get_param: mcp_version }
cfg01_flavor: { get_param: cfg_flavor }
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
@@ -678,7 +678,7 @@
instance_name: foundation
instance_image: { get_param: foundation_image }
instance_flavor: {get_param: foundation_flavor}
- availability_zone: { get_param: bm_availability_zone }
+ availability_zone: { get_param: vm_availability_zone }
management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 45e3cdd..69253c9 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -499,7 +499,7 @@
job_result, job_description = dt.start_job_on_jenkins(
job_name='deploy-upgrade-rabbitmq',
job_parameters=job_parameters,
- build_timeout=40 * 60
+ build_timeout=50 * 60
)
assert job_result == 'SUCCESS', job_description