aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-07-19 11:14:33 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-07-19 11:19:27 +0200
commit8be12c3c2ab924de714628cbba7e8120487c29d0 (patch)
treef34a6776bbd8ee4e62094fd6786319a1ec0a3388
parent14a990ea5506eafa736fec625835dfd51f379bcb (diff)
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)
-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 e4c88b8b0..729bcfbc4 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: 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 be18a3662..2e09e7198 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: 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 0c878c6ee..e4a6099b6 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: 196
+ ssh_timeout: 300
ip_version_for_ssh: 4
run_validation: true
connect_method: floating