From 5952f85343b432a710ebe5ccf7726977f8461d9c Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Thu, 29 Aug 2019 14:06:12 +0200
Subject: [PATCH] Allow overridding OS_TEST_TIMEOUT via the role variables

Change-Id: I7e464ba27704a0b4b13d6e0787b81750deee965e
---
 roles/run-tempest/README.rst         | 5 +++++
 roles/run-tempest/defaults/main.yaml | 1 +
 roles/run-tempest/tasks/main.yaml    | 1 +
 3 files changed, 7 insertions(+)

diff --git a/roles/run-tempest/README.rst b/roles/run-tempest/README.rst
index e1787b64c9..d4b253aef4 100644
--- 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
index 06918b5ad8..79df3e1bc1 100644
--- 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
index 16086aa8c7..24bd4dbddd 100644
--- 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 {} }}'