Use default ssh_timeout (300) in Functest

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 <cedric.ollivier@orange.com>
(cherry picked from commit 7c999385a25e77fa0603a962b0fbc9824e5139ae)

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index 2f964a1..429b7c5 100644 (file)
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -58,7 +58,7 @@ placement:
     max_microversion: "1.10"
 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 e4b9ee7..fd9bf04 100644 (file)
--- 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.30"
 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 4167b2d..473cd2b 100644 (file)
--- 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.30"
 validation:
     image_ssh_user: cirros
-    ssh_timeout: 196
+    ssh_timeout: 300
     ip_version_for_ssh: 4
     run_validation: true
     connect_method: floating