Bug 208521 - commit-queue should update working directory and reapply patch just before commiting
Summary: commit-queue should update working directory and reapply patch just before co...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: Other
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Aakash Jain
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2020-03-03 10:24 PST by Aakash Jain
Modified: 2020-03-03 16:13 PST (History)
4 users (show)

See Also:


Attachments
Patch (1.21 KB, patch)
2020-03-03 10:25 PST, Aakash Jain
jbedard: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Aakash Jain 2020-03-03 10:24:34 PST
After applying the patch, commit-queue does building and testing. Building and testing might take some time. Meanwhile there might be multiple commits to the repository. Therefore after running the tests, and just before committing the patch, commit-queue should update the working directory to ToT and re-apply the patch. This is similar to commit-queue behavior in old EWS.
Comment 1 Aakash Jain 2020-03-03 10:25:46 PST
Created attachment 392293 [details]
Patch
Comment 2 Jonathan Bedard 2020-03-03 11:08:29 PST
Comment on attachment 392293 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=392293&action=review

> Tools/BuildSlaveSupport/ews-build/factories.py:222
>          self.addStep(RunWebKit1Tests())

Shouldn't this be WebKit2 tests?
Comment 3 Aakash Jain 2020-03-03 14:20:33 PST
Comment on attachment 392293 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=392293&action=review

>> Tools/BuildSlaveSupport/ews-build/factories.py:222
>>          self.addStep(RunWebKit1Tests())
> 
> Shouldn't this be WebKit2 tests?

commit-queue runs WebKit1 tests. I don't remember the exact reason for that, probably to have coverage on less commonly tested configuration.
In old ews commit-queue uses mac port which uses --dump-render-tree https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/common/config/ports.py#L174
Comment 4 Aakash Jain 2020-03-03 14:20:55 PST
Committed r257803: <https://trac.webkit.org/changeset/257803>
Comment 5 Radar WebKit Bug Importer 2020-03-03 14:21:17 PST
<rdar://problem/60012903>
Comment 6 Jonathan Bedard 2020-03-03 15:19:44 PST
(In reply to Aakash Jain from comment #3)
> Comment on attachment 392293 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=392293&action=review
> 
> >> Tools/BuildSlaveSupport/ews-build/factories.py:222
> >>          self.addStep(RunWebKit1Tests())
> > 
> > Shouldn't this be WebKit2 tests?
> 
> commit-queue runs WebKit1 tests. I don't remember the exact reason for that,
> probably to have coverage on less commonly tested configuration.
> In old ews commit-queue uses mac port which uses --dump-render-tree
> https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/common/
> config/ports.py#L174

I think we should revisit the reason.

I suspect (although don't know for certain) the original reason is that WebKit2 tests were poorly gardened when they were first enabled. That is no longer the case, and in fact, it is likely WebKit1 tests which are more poorly gardened.
Comment 7 Alexey Proskuryakov 2020-03-03 15:57:45 PST
IIRC they were gardened equally well, but we knew that WebKit2 ran fewer tests because of unimplemented WebKitTestRunner functionality. 

That's still true as far as functionality goes, but there are now many WebKit2 only features and more code in WebKit2 itself. So I also think that we should switch CQ to WebKit2.
Comment 8 Aakash Jain 2020-03-03 16:13:57 PST
(In reply to Alexey Proskuryakov from comment #7)
> IIRC they were gardened equally well, but we knew that WebKit2 ran fewer
> tests because of unimplemented WebKitTestRunner functionality. 
> 
> That's still true as far as functionality goes, but there are now many WebKit2 only features and more code in WebKit2 itself. So I also think that we should switch CQ to WebKit2.
Switching it in Bug 208544.