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=refs%2Fchanges%2F29%2F70629%2F1;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)
---

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index fd029b4f4..aa61e3724 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: 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 fd029b4f4..aa61e3724 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: 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 a9dcc74c8..1b5d726a3 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: 300
+    ssh_timeout: 196
     ip_version_for_ssh: 4
     run_validation: true
     connect_method: floating