Attachment 16836 Details for Bug 14844 – patch from master cherry-picked to 4.15 (only)

[patch] patch from master cherry-picked to 4.15 (only)

0001-.gitlab-ci-Allow-a-1-hour-to-build-Samba.patch (text/plain), 1.28 KB, created by Andrew Bartlett on 2021-10-04 08:32:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2021-10-04 08:32:05 UTC

Size: 1.28 KB

patch

obsolete

>From 7a27359c334c7ba936e18be2883975e0d64f5183 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Thu, 23 Sep 2021 11:14:35 +1200
>Subject: [PATCH] .gitlab-ci: Allow a 1 hour to build Samba
>
>I have seen cases where the job is pushed to the private runners
>(which do not have the ccache) where this takes over 45mins, and
>a typical job can be 35 mins so this is too tight.
>
>Triggering the timeout causes a rebuild from scratch, which is
>done twice automatically, and is financially costly (we pay
>per VM start) and a waste of CPU/energy/etc.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14844
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Fri Oct  1 19:43:16 UTC 2021 on sn-devel-184
>
>(cherry picked from commit 1305ec3ae64e67fa68d3251d35f8a244a4a5be56)
>---
> .gitlab-ci-main.yml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
>index 4b2f17938c8..832e8a8b5e7 100644
>--- a/.gitlab-ci-main.yml
>+++ b/.gitlab-ci-main.yml
>@@ -169,7 +169,7 @@ others:
> 
> .shared_template_build_only:
>   extends: .shared_template
>-  timeout: 45m
>+  timeout: 1h
>   artifacts:
>     expire_in: 1 week
>     paths:
>-- 
>2.25.1
>

Flags:

jra: review+

Actions: View

Attachments on bug 14844: 16836