Bug 193138 - [ews-build] use svn-apply script to apply the patches
Summary: [ews-build] use svn-apply script to apply the patches
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: 2019-01-04 06:12 PST by Aakash Jain
Modified: 2019-01-04 13:15 PST (History)
7 users (show)

See Also:


Attachments
Proposed patch (4.26 KB, patch)
2019-01-04 07:18 PST, Aakash Jain
no flags Details | Formatted Diff | Diff
Archive of layout-test-results from ews100 for mac-sierra (2.47 MB, application/zip)
2019-01-04 08:21 PST, EWS Watchlist
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Aakash Jain 2019-01-04 06:12:15 PST
Default Buildbot git/svn methods to apply the patch (which uses either patch command or git apply command) can not reliably apply the WebKit patches. Especially in dealing with ChangeLog (e.g.: when there have been further commits on ToT between the time when  patch was generated by an engineer and patch was applied by EWS). 

svn-patch can much effectively handle such cases. Current OpenSource EWS uses svn-patch script to apply the patches. We should also use the same script for new Buildbot based EWS.
Comment 1 Aakash Jain 2019-01-04 07:18:55 PST
Created attachment 358316 [details]
Proposed patch

Sample run: http://ews-build.webkit-uat.org/#/builders/21/builds/907
Comment 2 EWS Watchlist 2019-01-04 07:23:21 PST Comment hidden (obsolete)
Comment 3 EWS Watchlist 2019-01-04 08:21:13 PST
Comment on attachment 358316 [details]
Proposed patch

Attachment 358316 [details] did not pass mac-ews (mac):
Output: https://webkit-queues.webkit.org/results/10628013

New failing tests:
http/wpt/css/css-animations/start-animation-001.html
Comment 4 EWS Watchlist 2019-01-04 08:21:14 PST
Created attachment 358319 [details]
Archive of layout-test-results from ews100 for mac-sierra

The attached test failures were seen while running run-webkit-tests on the mac-ews.
Bot: ews100  Port: mac-sierra  Platform: Mac OS X 10.12.6
Comment 5 Lucas Forschler 2019-01-04 08:51:03 PST
Comment on attachment 358316 [details]
Proposed patch

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

> Tools/BuildSlaveSupport/ews-build/steps.py:95
> +    name = 'clean-and-update-working-directory'

this seems like it is not related to this patch, but if it's just a drive by fix, then go ahead and leave it.

> Tools/BuildSlaveSupport/ews-build/steps.py:120
> +        return sourcestamp.patch[1]

it's unclear to me why we are indexing '1' here, can you put a comment?
Comment 6 Aakash Jain 2019-01-04 11:49:18 PST
Comment on attachment 358316 [details]
Proposed patch

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

>> Tools/BuildSlaveSupport/ews-build/steps.py:95
>> +    name = 'clean-and-update-working-directory'
> 
> this seems like it is not related to this patch, but if it's just a drive by fix, then go ahead and leave it.

Yeah, it's a drive by fix.

>> Tools/BuildSlaveSupport/ews-build/steps.py:120
>> +        return sourcestamp.patch[1]
> 
> it's unclear to me why we are indexing '1' here, can you put a comment?

It's based on how buildbot internally store the patch (inside sourcestamp). Referred from https://github.com/buildbot/buildbot/blob/master/master/buildbot/steps/source/base.py#L223

Note that Sourcestamp info is visible when you click on 'Debug' tab on any build.
Comment 7 WebKit Commit Bot 2019-01-04 13:14:23 PST
Comment on attachment 358316 [details]
Proposed patch

Clearing flags on attachment: 358316

Committed r239633: <https://trac.webkit.org/changeset/239633>
Comment 8 WebKit Commit Bot 2019-01-04 13:14:25 PST
All reviewed patches have been landed.  Closing bug.
Comment 9 Radar WebKit Bug Importer 2019-01-04 13:15:33 PST
<rdar://problem/47055515>