Increase shotgun pipeline timeout

When running shotgun tests on tagged releases, the increased number of
jobs may cause the shotgun pipeline to take longer than 50 minutes to
finish.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56addbc202f1f8656ecd8981c22814804cc6f15d..84ae8f4b25b4c60aa645dedcde4f594afef05b52 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -363,6 +363,7 @@ stages:
   needs:
     - job: ci-variables
       artifacts: true
+  timeout: 2h
 
 .system_test_common: &system_test_common
   <<: *default_triggering_rules

diff --git a/util/ci-wait-shotgun.py b/util/ci-wait-shotgun.py
index ae126e615f65d416780f4ae02246630adad7f62b..c7f5f26eabd3508636fa2bef70a9b5c082929b16 100755 (executable)
--- a/util/ci-wait-shotgun.py
+++ b/util/ci-wait-shotgun.py
@@ -53,7 +53,7 @@ def get_child_pipeline_id(project, pipeline_id):
         pipeline.refresh()
         return pipeline.finished_at is not None
 
-    wait_until(pipeline_finished, timeout=3000)
+    wait_until(pipeline_finished, timeout=6600)
 
     bridges = pipeline.bridges.list()
     if len(bridges) != 1: