From a36c93c0b9237a8b340f7719aab4fd6c9cd9a8f6 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Thu, 6 Mar 2014 10:45:30 +1300 Subject: [PATCH] Backout 0b68a3d395b3 from bug 846104, because of Bug 975191 - Self serve API for oak not building Oak nightly builds even know there is a nightly from 2 days ago --- buildapi/scripts/selfserve-agent.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/buildapi/scripts/selfserve-agent.py b/buildapi/scripts/selfserve-agent.py index bbfd812..84356dd 100644 --- a/buildapi/scripts/selfserve-agent.py +++ b/buildapi/scripts/selfserve-agent.py @@ -449,7 +449,7 @@ def do_new_build_at_revision(self, message_data, message): subprocess.check_call(cmd) return {"errors": False, "msg": "Ok"} - def _create_build_for_revision(self, who, branch, revision, priority, builder_expressions, builder_exclusions=None): + def _create_build_for_revision(self, who, branch, revision, priority, builder_expression, builder_exclusions=None): if builder_exclusions is None: builder_exclusions = ['%l10n nightly'] now = time.time() @@ -457,19 +457,16 @@ def _create_build_for_revision(self, who, branch, revision, priority, builder_ex # Find builders that have been active in the past 2 weeks q = """SELECT DISTINCT buildername FROM buildrequests WHERE + buildername LIKE :buildername AND """ - for i, bx in enumerate(builder_expressions): - q = q + "buildername LIKE :buildername_expression_%i AND " % i - for i, bx in enumerate(builder_exclusions): q = q + "buildername NOT LIKE :buildername_exclusion_%i AND " % i q = q + """ submitted_at > :submitted_at""" qparams = { + 'buildername': builder_expression, 'submitted_at': time.time() - 14 * 24 * 3600, } - for i, bx in enumerate(builder_expressions): - qparams['buildername_expression_%i' % i] = builder_expressions[i] for i, bx in enumerate(builder_exclusions): qparams['buildername_exclusion_%i' % i] = builder_exclusions[i] result = self.db.execute(text(q), qparams) @@ -539,7 +536,7 @@ def do_new_pgobuild_at_revision(self, message_data, message): branch, revision, priority, - ["%% %s pgo-build" % branch]) + "%% %s pgo-build" % branch) def do_new_nightly_at_revision(self, message_data, message): who = message_data['who'] @@ -552,7 +549,7 @@ def do_new_nightly_at_revision(self, message_data, message): branch, revision, priority, - ['%\_' + branch + '\_%nightly', '% ' + branch + ' %nightly%'], + '%' + branch + '%nightly', ['%' + branch + '_v%nightly', '%l10n nightly']) def do_cancel_revision(self, message_data, message):