From 9854562bb181a63f42e7115da9cc48d1811fe6fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sun, 19 Jul 2020 11:14:33 +0200 Subject: [PATCH] Use default ssh_timeout (300) in Functest MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 196 is used in OpenStack gates but it doesn't fit the Functest model. Functest runs all test cases in parallel vs the same SUT. https://github.com/openstack/tempest/blob/master/tempest/lib/common/ssh.py#L38 Change-Id: I2db072a3cb691bc200cd4357852cdd8ceda91a1b Signed-off-by: Cédric Ollivier (cherry picked from commit 7c999385a25e77fa0603a962b0fbc9824e5139ae) --- docker/smoke-cntt/tempest_conf.yaml | 2 +- functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml | 2 +- .../opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml index aa61e3724..fd029b4f4 100644 --- a/docker/smoke-cntt/tempest_conf.yaml +++ b/docker/smoke-cntt/tempest_conf.yaml @@ -58,7 +58,7 @@ placement: max_microversion: 1.36 validation: image_ssh_user: cirros - ssh_timeout: 196 + ssh_timeout: 300 ip_version_for_ssh: 4 run_validation: true connect_method: floating 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 aa61e3724..fd029b4f4 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml @@ -58,7 +58,7 @@ placement: max_microversion: 1.36 validation: image_ssh_user: cirros - ssh_timeout: 196 + ssh_timeout: 300 ip_version_for_ssh: 4 run_validation: true connect_method: floating 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 1b5d726a3..a9dcc74c8 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 @@ -58,7 +58,7 @@ placement: max_microversion: 1.36 validation: image_ssh_user: cirros - ssh_timeout: 196 + ssh_timeout: 300 ip_version_for_ssh: 4 run_validation: true connect_method: floating -- 2.16.6