From cc76c1ee97d2e87476844cc86fee4b50736fe2f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= <nicki@isc.org>
Date: Tue, 8 Oct 2024 16:22:19 +0200
Subject: [PATCH] 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.

(cherry picked from commit 3b227e116146115aaccec7f1cd4aa734ec16be38)
---
 .gitlab-ci.yml          | 1 +
 util/ci-wait-shotgun.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33c214c744..45e961d56f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -354,6 +354,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 ae126e615f..c7f5f26eab 100755
--- 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: