diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-24 12:04:16 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-24 12:07:56 +0200 |
| commit | c6d8bb91edb79839ff9292820a5ed3fe5d795613 (patch) | |
| tree | 0261be8b26a4d3b45600d92ef25b61364279dcee | |
| parent | 4960e0bdc6b0ef52508214a77473bd6d0cde6a0c (diff) | |
Precise validation configs in Neutron
ServerActionsTestJSON.test_reboot_server_hard [1] sometimes fails in
gates. We may increase timeouts if it stills fails.
[1] http://artifacts.opnfv.org/functest/LIQH38CPR30X/functest-opnfv-functest-smoke-hunter-tempest_full-run-649/tempest_full/tempest-report.html
Change-Id: Ia27c0faead1df5c2b33a3e1a272e5a1010a5a83e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 7ccc1b0793e32cad3912e63bbca971d5c3ecd724)
4 files changed, 29 insertions, 0 deletions
diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml index 01fed476e..0c2aa3bd5 100644 --- a/docker/smoke-cntt/tempest_conf.yaml +++ b/docker/smoke-cntt/tempest_conf.yaml @@ -56,6 +56,12 @@ network-feature-enabled: floating_ips: true placement: max_microversion: "1.10" +validation: + image_ssh_user: cirros + ssh_timeout: 196 + ip_version_for_ssh: 4 + run_validation: true + connect_method: floating volume: max_microversion: 3.43 storage_protocol: ceph diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml index eaae408d2..4cbe2a20b 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml @@ -56,6 +56,12 @@ network-feature-enabled: floating_ips: true placement: max_microversion: 1.31 +validation: + image_ssh_user: cirros + ssh_timeout: 196 + ip_version_for_ssh: 4 + run_validation: true + connect_method: floating volume: max_microversion: 3.59 storage_protocol: ceph diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml index 65e745a31..ab71bf0a7 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml @@ -56,6 +56,12 @@ network-feature-enabled: floating_ips: true placement: max_microversion: 1.31 +validation: + image_ssh_user: cirros + ssh_timeout: 196 + ip_version_for_ssh: 4 + run_validation: true + connect_method: floating volume: max_microversion: 3.59 storage_protocol: ceph diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 310d9d35b..c6566cad6 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -524,6 +524,16 @@ class TempestCommon(singlevm.VmReady2): with open(self.conf_file, 'w') as config_file: rconfig.write(config_file) + def update_validation_section(self): + """Update validation section in tempest.conf""" + rconfig = configparser.RawConfigParser() + rconfig.read(self.conf_file) + if not rconfig.has_section('validation'): + rconfig.add_section('validation') + rconfig.set('validation', 'network_for_ssh', self.network.name) + with open(self.conf_file, 'w') as config_file: + rconfig.write(config_file) + def update_scenario_section(self): """Update scenario section in tempest.conf""" rconfig = configparser.RawConfigParser() @@ -589,6 +599,7 @@ class TempestCommon(singlevm.VmReady2): domain_id=self.project.domain.id) self.update_network_section() self.update_compute_section() + self.update_validation_section() self.update_scenario_section() self.backup_tempest_config(self.conf_file, self.res_dir) |