From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 12 Nov 2020 16:39:45 +0000 (+0100)
Subject: Add timeout as needed by Gitlab CI/CD
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F71388%2F1;p=functest.git

Add timeout as needed by Gitlab CI/CD

Gitlab CI/CD sets 1h as default timeout.
The timeout is valid for all test cases in tiers (current XtestingCI
design).

Change-Id: I1ffae060ee8fd26426a9ee9a2ad2cd131ff9abe9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 19ccc35303f0626a9d62dbbf2be9d8afe3152ea0)
---

diff --git a/ansible/site.cntt.yml b/ansible/site.cntt.yml
index 2e6924bf3..cac76696b 100644
--- a/ansible/site.cntt.yml
+++ b/ansible/site.cntt.yml
@@ -24,6 +24,7 @@
             - tempest_smoke
             - tempest_horizon
         - container: functest-smoke-cntt
+          timeout: 2h
           tests:
             - tempest_neutron_cntt
             - tempest_cinder_cntt
@@ -34,12 +35,14 @@
             - tempest_scenario_cntt
             - tempest_slow_cntt
         - container: functest-benchmarking-cntt
+          timeout: 4h
           tests:
             - rally_full_cntt
             - rally_jobs_cntt
             - vmtp
             - shaker
         - container: functest-vnf
+          timeout: 2h
           tests:
             - cloudify
             - cloudify_ims
diff --git a/ansible/site.gate.yml b/ansible/site.gate.yml
index 8aab5f988..44271003e 100644
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -56,6 +56,7 @@
             - tempest_smoke
             - tempest_horizon
         - container: functest-smoke
+          timeout: 2h
           tests:
             - tempest_neutron
             - tempest_cinder
@@ -76,12 +77,14 @@
             - tempest_barbican
             - tempest_octavia
         - container: functest-benchmarking
+          timeout: 4h
           tests:
             - rally_full
             - rally_jobs
             - vmtp
             - shaker
         - container: functest-vnf
+          timeout: 2h
           tests:
             - cloudify
             - cloudify_ims
diff --git a/ansible/site.yml b/ansible/site.yml
index 63349137b..dc55eec1f 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -24,6 +24,7 @@
             - tempest_smoke
             - tempest_horizon
         - container: functest-smoke
+          timeout: 2h
           tests:
             - tempest_neutron
             - tempest_cinder
@@ -44,12 +45,14 @@
             - tempest_barbican
             - tempest_octavia
         - container: functest-benchmarking
+          timeout: 4h
           tests:
             - rally_full
             - rally_jobs
             - vmtp
             - shaker
         - container: functest-vnf
+          timeout: 2h
           tests:
             - cloudify
             - cloudify_ims