From a77f9a876ecb77af9804db03e4f5580db3cd25cf Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 15 Jun 2020 11:58:10 +0200 Subject: Increase timeout in shaker and vmtp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Running them in parallel of rally full and jobs asks for a increase. It reverts the previous change which doesn't change the right parameters [1]. [1] https://gerrit.opnfv.org/gerrit/c/functest/+/70320 Change-Id: Ib2369d384ac839fb46031411e1985ac402da0c1e Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/shaker/shaker.py | 3 ++- functest/opnfv_tests/openstack/vmtp/vmtp.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py index 20bb42c02..917c65980 100644 --- a/functest/opnfv_tests/openstack/shaker/shaker.py +++ b/functest/opnfv_tests/openstack/shaker/shaker.py @@ -39,7 +39,8 @@ class Shaker(singlevm.SingleVm2): username = 'debian' port = 9000 ssh_connect_loops = 12 - create_server_timeout = 600 + create_server_timeout = 300 + check_console_loop = 12 shaker_timeout = '3600' quota_instances = -1 quota_cores = -1 diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py index bb4ea4172..76bc4e5e1 100644 --- a/functest/opnfv_tests/openstack/vmtp/vmtp.py +++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py @@ -49,7 +49,8 @@ class Vmtp(singlevm.VmReady2): flavor_ram = 2048 flavor_vcpus = 1 flavor_disk = 0 - create_server_timeout = 600 + create_server_timeout = 300 + ssh_retry_timeout = 240 def __init__(self, **kwargs): if "case_name" not in kwargs: @@ -122,6 +123,7 @@ class Vmtp(singlevm.VmReady2): self.guid) vmtp_conf["dns_nameservers"] = [env.get('NAMESERVER')] vmtp_conf["generic_retry_count"] = self.create_server_timeout // 2 + vmtp_conf["ssh_retry_count"] = self.ssh_retry_timeout // 2 conf.write(yaml.dump(vmtp_conf)) def run_vmtp(self): -- cgit 1.2.3-korg