From 2000750e13f904db2c81719961e3bbef9451a727 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 6 Nov 2024 13:42:13 +0100 Subject: [PATCH] Fixes for diegorusso-aarch64-bigmem (#553) * no_builds_between: Return a Deferred * no_builds_between: Get the current date inside the nextBuild function --- master/master.cfg | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/master/master.cfg b/master/master.cfg index 49d0871c..53037b30 100644 --- a/master/master.cfg +++ b/master/master.cfg @@ -20,6 +20,7 @@ from functools import partial from buildbot.plugins import reporters, schedulers, util from buildbot import locks from twisted.python import log +from twisted.internet import defer import sentry_sdk from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration @@ -204,19 +205,20 @@ def get_delay(now, end): # Avoid a build to be started between start and end time and delay such build # at end time def no_builds_between(start, end): - now = datetime.now().time() start = datetime.strptime(start, "%H:%M").time() end = datetime.strptime(end, "%H:%M").time() def f(builder, requests): + now = datetime.now().time() if is_within_time_range(now, start, end): delay = get_delay(now, end) # Schedule the build later + deferred = defer.Deferred() builder.master.reactor.callLater( int(delay), - builder.buildset_manager.submitBuildSet, + deferred.callback, requests[0], ) - return None + return deferred # Schedule the build now return requests[0] return f