Bug 28040 – commit-queue needs a master process

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Adam Barth]

To make the commit queue more robust, I'm using a master process that call bugzilla-tool.  We should add the master process to the repository so other folks can use it too.

[Adam Barth]

Created attachment 34204 [details]
Patch v1

[Jeremy Orlow]

I know this is really simple at the moment, but can we please make this Python from the start?  I've seen plenty of scripts start out this size and then balloon over time.  The second we try to do something like integrate with the waterfall, other try bots, etc, we'll be happy we did.

[Adam Barth]

Comment on attachment 34204 [details]
Patch v1

Ok.  It's good for me to learn more python anyway.

[Eric Seidel (no email)]

If you're going to make it python, you might find it easier to make it a Command in bugzilla-tool.  such a command could of course just call bugzilla-tool again.  directly, or via the shell, depending on what you wanted to do.

[Eric Seidel (no email)]

Created attachment 38416 [details]
First attempt, needs revision

[Eric Seidel (no email)]

I could definitely make the logging code simpler.

[Eric Seidel (no email)]

Created attachment 38573 [details]
Better, not perfect


---
 3 files changed, 98 insertions(+), 3 deletions(-)

[Eric Seidel (no email)]

Created attachment 38637 [details]
Patch v1

[Adam Barth]

Comment on attachment 38637 [details]
Patch v1

+            self._run_command(['bugzilla-tool', 'land-patches', '--force-clean', '--commit-queue', '--quiet', bug_id])

This seems to require bugzilla-tool to be in your path.  We should use our get webkit script path routine here.

+            bug_id = bug_ids[0]

I'm worried we could get stuck in a loop processing bug zero.  Can't we restructure this loop so we go through all the bugs in the queue?  Also, we should put everything in the try-catch to avoid dieing on exceptions.

[Eric Seidel (no email)]

(In reply to comment #9)
> (From update of attachment 38637 [details])
> +            self._run_command(['bugzilla-tool', 'land-patches',
> '--force-clean', '--commit-queue', '--quiet', bug_id])
> 
> This seems to require bugzilla-tool to be in your path.  We should use our get
> webkit script path routine here.

Nah, fixed using __FILE__.  We want to execute the exact same script as we're currently executing, no matter where it may be.

> +            bug_id = bug_ids[0]
> 
> I'm worried we could get stuck in a loop processing bug zero.  Can't we
> restructure this loop so we go through all the bugs in the queue?  Also, we
> should put everything in the try-catch to avoid dieing on exceptions.

Yup, we could get stuck.  I don't think we should try and handle that case.  The commit-queue is a remotely stored queue.  We shouldn't be trying to work around possible bugs in updating that queue.  If it gets stuck, someone will fix the bug which caused it to get stuck. ;)

[Eric Seidel (no email)]

Created attachment 38690 [details]
Updated to use __file__


---
 4 files changed, 123 insertions(+), 3 deletions(-)

[Adam Barth]

Comment on attachment 38690 [details]
Updated to use __file__

No unit tests.  :)

This probably isn't perfect, but it's a good start.  By the way, it annoys me that we use single and double quoted strings indiscriminately.  Can't we pick one and call it a day?

[Eric Seidel (no email)]

Comment on attachment 38690 [details]
Updated to use __file__

Rejecting patch 38690 from commit-queue.  This patch will require manual commit.

['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1'] failed with exit code 1

[Adam Barth]

Comment on attachment 38690 [details]
Updated to use __file__

Try again.

[Eric Seidel (no email)]

Comment on attachment 38690 [details]
Updated to use __file__

Rejecting patch 38690 from commit-queue.  This patch will require manual commit.

['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1'] failed with exit code 1

[Eric Seidel (no email)]

Comment on attachment 38690 [details]
Updated to use __file__

Two unrelated test failures, must be flakey tests.

[Eric Seidel (no email)]

Comment on attachment 38690 [details]
Updated to use __file__

Rejecting patch 38690 from commit-queue.  This patch will require manual commit.

['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1'] failed with exit code 1

[Eric Seidel (no email)]

Comment on attachment 38690 [details]
Updated to use __file__

Unrelated test timed out. :(  Our tests are really flakey it seems!

[Eric Seidel (no email)]

Comment on attachment 38690 [details]
Updated to use __file__

Clearing flags on attachment: 38690

Committed r47881: <http://trac.webkit.org/changeset/47881>

[Eric Seidel (no email)]

All reviewed patches have been landed.  Closing bug.