aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.d
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.d')
-rw-r--r--.gitlab-ci.d/cirrus.yml3
-rw-r--r--.gitlab-ci.d/cirrus/build.yml2
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index 41d64d6680..816d89cc2a 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -15,6 +15,9 @@
stage: build
image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
needs: []
+ # 20 mins larger than "timeout_in" in cirrus/build.yml
+ # as there's often a 5-10 minute delay before Cirrus CI
+ # actually starts the task
timeout: 80m
allow_failure: true
script:
diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml
index a9444902ec..29d55c4aa3 100644
--- a/.gitlab-ci.d/cirrus/build.yml
+++ b/.gitlab-ci.d/cirrus/build.yml
@@ -16,6 +16,8 @@ env:
TEST_TARGETS: "@TEST_TARGETS@"
build_task:
+ # A little shorter than GitLab timeout in ../cirrus.yml
+ timeout_in: 60m
install_script:
- @UPDATE_COMMAND@
- @INSTALL_COMMAND@ @PKGS@