Merge "Allow overridding OS_TEST_TIMEOUT via the role variables"

openstack · Sep 7, 2019 · 8d1b365 · 8d1b365
2 parents 6cdbfe2 + 5952f85
commit 8d1b365
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/roles/run-tempest/README.rst b/roles/run-tempest/README.rst
@@ -67,3 +67,8 @@ Run Tempest
        ::
            vars:
              tox_extra_args: --sitepackages
+
+.. zuul:rolevar:: tempest_test_timeout
+   :default: ''
+
+   The timeout (in seconds) for each test.
diff --git a/roles/run-tempest/defaults/main.yaml b/roles/run-tempest/defaults/main.yaml
@@ -3,3 +3,4 @@ tempest_test_regex: ''
 tox_envlist: smoke
 tempest_black_regex: ''
 tox_extra_args: ''
+tempest_test_timeout: ''
diff --git a/roles/run-tempest/tasks/main.yaml b/roles/run-tempest/tasks/main.yaml
@@ -42,3 +42,4 @@
     chdir: "{{devstack_base_dir}}/tempest"
   become: true
   become_user: tempest
+  environment: '{{ {"OS_TEST_TIMEOUT": tempest_test_timeout} if tempest_test_timeout else {} }}'