diff options
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 734667530..3b1189fd6 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -5,7 +5,7 @@ ARG OPENSTACK_TAG=master RUN apk --no-cache add --update \ python3 libffi openssl libjpeg-turbo py3-pip bash \ - grep sed wget ca-certificates git openssh-client qemu-img && \ + grep sed wget ca-certificates git openssh-client qemu-img iputils && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 22b508afa..46c1d95da 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -67,6 +67,7 @@ class RallyBase(singlevm.VmReady2): visibility = 'public' shared_network = True allow_no_fip = True + task_timeout = '3600' def __init__(self, **kwargs): """Initialize RallyBase object.""" @@ -524,7 +525,8 @@ class RallyBase(singlevm.VmReady2): if self.file_is_empty(file_name): LOGGER.info('No tests for scenario "%s"', test_name) return False - self.run_cmd = (["rally", "task", "start", "--abort-on-sla-failure", + self.run_cmd = (["timeout", self.task_timeout, + "rally", "task", "start", "--abort-on-sla-failure", "--task", self.task_file, "--task-args", str(self.build_task_args(test_name))]) return True @@ -729,6 +731,7 @@ class RallyJobs(RallyBase): """Rally OpenStack CI testcase implementation.""" stests = ["neutron"] + task_timeout = '7200' def __init__(self, **kwargs): """Initialize RallyJobs object.""" @@ -834,7 +837,8 @@ class RallyJobs(RallyBase): os.makedirs(self.temp_dir) task_file_name = os.path.join(self.temp_dir, task_name) self.apply_blacklist(task, task_file_name) - self.run_cmd = (["rally", "task", "start", "--task", task_file_name, + self.run_cmd = (["timeout", self.task_timeout, + "rally", "task", "start", "--task", task_file_name, "--task-args", str(self.build_task_args(test_name))]) return True |