From 36378e6393f3117ade9d8edbe07c6231b1b50a10 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 30 Nov 2018 14:25:11 +0100 Subject: [PATCH] GH-68: git clone failures mark the build as WARNING If "git clone" fails, mark the whole build as WARNING (warnOnFailure), not as "FAILURE" (flunkOnFailure). --- master/custom/steps.py | 11 ++++++++++- master/master.cfg | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/master/custom/steps.py b/master/custom/steps.py index 451bfa6b..9427fdb9 100644 --- a/master/custom/steps.py +++ b/master/custom/steps.py @@ -1,6 +1,15 @@ import re from buildbot.steps.shell import ShellCommand, Test as BaseTest +from buildbot.steps.source.git import Git as _Git + + +class Git(_Git): + # GH-68: If "git clone" fails, mark the whole build as WARNING + # (warnOnFailure), not as "FAILURE" (flunkOnFailure) + haltOnFailure = True + flunkOnFailure = False + warnOnFailure = True class Test(BaseTest): @@ -44,7 +53,7 @@ class Test(BaseTest): # if tests have warnings, mark the overall build as WARNINGS (orange) warnOnWarnings = True - + # 3 hours should be enough even for refleak builds. maxTime = 3 * 60 * 60 # Give SIGTERM 30 seconds to shut things down before SIGKILL. diff --git a/master/master.cfg b/master/master.cfg index 54d2c6fb..95fa6055 100644 --- a/master/master.cfg +++ b/master/master.cfg @@ -20,7 +20,6 @@ from buildbot.schedulers.forcesched import ForceScheduler from buildbot.schedulers.timed import Nightly from buildbot.plugins import reporters, util from buildbot import locks -from buildbot.steps.source.git import Git sys.path.append(os.path.dirname(__file__)) # noqa: E402 @@ -47,6 +46,7 @@ from custom.factories import ( Windows64ReleaseBuild, ) from custom.pr_reporter import GitHubPullRequestReporter +from custom.steps import Git # sensitive and/or instance-specific values try: