From: Nicki Křížek <nicki@isc.org>
Date: Tue, 8 Oct 2024 14:22:19 +0000 (+0200)
Subject: Increase shotgun pipeline timeout
X-Git-Tag: v9.21.3~87^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b227e116146115aaccec7f1cd4aa734ec16be38;p=thirdparty%2Fbind9.git

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 56addbc202f..84ae8f4b25b 100644
--- 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 ae126e615f6..c7f5f26eabd 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: