aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-08-01 11:43:42 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-08-01 12:12:00 +0200
commitb578b6c1b4d9333906224ecc59cb7de82a11cc9d (patch)
tree0f7262a74789c06a368096ef7ff790838836450f
parent8bbe3caf993b88246073bdc9c34e5ecedb018e25 (diff)
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)
-rw-r--r--docker/smoke-cntt/tempest_conf.yaml2
-rw-r--r--functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml2
-rw-r--r--functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index 729bcfbc4..e4c88b8b0 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 2e09e7198..be18a3662 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.31
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 e4a6099b6..0c878c6ee 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.31
validation:
image_ssh_user: cirros
- ssh_timeout: 300
+ ssh_timeout: 196
ip_version_for_ssh: 4
run_validation: true
connect_method: floating