From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 1 Aug 2020 09:43:42 +0000 (+0200)
Subject: Revert ssh_timeout to 196 in Functest
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7e43c0878a34675bb42c51a38346606181dc9aee;p=functest.git

Revert ssh_timeout to 196 in Functest

The race condition has been fixed [1] and we can try the timeout used
in OpenStack gates.

[1] https://gerrit.opnfv.org/gerrit/c/functest/+/70606

Change-Id: Iaf8b260c743c1fd0088d31060a43b1788545743c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit b9dab9d9dcff803b71ce42ad26578f14ed448cb3)
(cherry picked from commit aa2f20598c42a4235bb85b6a8f9dc262bb791465)
---

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index 429b7c519..2f964a1ed 100644
--- 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: 300
+    ssh_timeout: 196
     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 fd9bf0419..e4b9ee701 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.30"
 validation:
     image_ssh_user: cirros
-    ssh_timeout: 300
+    ssh_timeout: 196
     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 473cd2bb3..4167b2d02 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.30"
 validation:
     image_ssh_user: cirros
-    ssh_timeout: 300
+    ssh_timeout: 196
     ip_version_for_ssh: 4
     run_validation: true
     connect_method: floating