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%2F89%2F71389%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 b4c8bcad7..cddc1ab1e 100644
--- a/ansible/site.cntt.yml
+++ b/ansible/site.cntt.yml
@@ -23,6 +23,7 @@
             - odl
             - tempest_smoke
         - container: functest-smoke-cntt
+          timeout: 2h
           tests:
             - tempest_neutron_cntt
             - tempest_cinder_cntt
@@ -33,12 +34,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 eb99e9240..d9e9e4f47 100644
--- a/ansible/site.gate.yml
+++ b/ansible/site.gate.yml
@@ -59,6 +59,7 @@
             - tempest_smoke
             - tempest_horizon
         - container: functest-smoke
+          timeout: 2h
           tests:
             - tempest_neutron
             - tempest_cinder
@@ -74,12 +75,14 @@
             - networking-sfc
             - barbican
         - 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 e556b1b5b..92bde9134 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
@@ -39,12 +40,14 @@
             - networking-sfc
             - barbican
         - container: functest-benchmarking
+          timeout: 4h
           tests:
             - rally_full
             - rally_jobs
             - vmtp
             - shaker
         - container: functest-vnf
+          timeout: 2h
           tests:
             - cloudify
             - cloudify_ims