Attachment 358587 Details for Bug 193235 – Proposed patch

[patch] Proposed patch

ews-build-ewspatchid.patch (text/plain), 5.94 KB, created by Aakash Jain on 2019-01-08 07:20:19 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2019-01-08 07:20:19 PST

Size: 5.94 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 239724)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-01-08  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] use patch_id instead of ewspatchid
>+        https://bugs.webkit.org/show_bug.cgi?id=193235
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/ews-build/factories.py: Replaced ewspatchid with patch_id.
>+        * BuildSlaveSupport/ews-build/steps.py: Ditto.
>+        * BuildSlaveSupport/ews-build/steps_unittest.py: Ditto.
>+
> 2019-01-07  David Kilzer  <ddkilzer@apple.com>
> 
>         Leak of ScrollCompletionCallbackData (16 bytes) in com.apple.WebKit.WebContent running WebKit layout tests
>Index: Tools/BuildSlaveSupport/ews-build/factories.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/factories.py	(revision 239723)
>+++ Tools/BuildSlaveSupport/ews-build/factories.py	(working copy)
>@@ -79,7 +79,7 @@ class BuildFactory(Factory):
> 
>     def propertiesToPassToTriggers(self):
>         return {
>-            "ewspatchid": Property("ewspatchid"),
>+            "patch_id": Property("patch_id"),
>             "configuration": Property("configuration"),
>             "platform": Property("platform"),
>             "fullPlatform": Property("fullPlatform"),
>Index: Tools/BuildSlaveSupport/ews-build/steps.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps.py	(revision 239723)
>+++ Tools/BuildSlaveSupport/ews-build/steps.py	(working copy)
>@@ -627,7 +627,7 @@ class ArchiveBuiltProduct(shell.ShellCom
> class UploadBuiltProduct(transfer.FileUpload):
>     name = 'upload-built-product'
>     workersrc = WithProperties('WebKitBuild/%(configuration)s.zip')
>-    masterdest = WithProperties('public_html/archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(ewspatchid)s.zip')
>+    masterdest = WithProperties('public_html/archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')
>     haltOnFailure = True
> 
>     def __init__(self, **kwargs):
>@@ -641,7 +641,7 @@ class UploadBuiltProduct(transfer.FileUp
> class DownloadBuiltProduct(shell.ShellCommand):
>     command = ['python', 'Tools/BuildSlaveSupport/download-built-product',
>         WithProperties('--platform=%(platform)s'), WithProperties('--%(configuration)s'),
>-        WithProperties(EWS_URL + 'archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(ewspatchid)s.zip')]
>+        WithProperties(EWS_URL + 'archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
>     name = 'download-built-product'
>     description = ['downloading built product']
>     descriptionDone = ['downloaded built product']
>@@ -694,7 +694,7 @@ class ArchiveTestResults(shell.ShellComm
> class UploadTestResults(transfer.FileUpload):
>     name = 'upload-test-results'
>     workersrc = 'layout-test-results.zip'
>-    masterdest = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:ewspatchid)s-%(prop:buildnumber)s.zip')
>+    masterdest = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s.zip')
>     haltOnFailure = True
> 
>     def __init__(self, **kwargs):
>@@ -707,8 +707,8 @@ class UploadTestResults(transfer.FileUpl
> 
> class ExtractTestResults(master.MasterShellCommand):
>     name = 'extract-test-results'
>-    zipFile = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:ewspatchid)s-%(prop:buildnumber)s.zip')
>-    resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:ewspatchid)s-%(prop:buildnumber)s')
>+    zipFile = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s.zip')
>+    resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s')
> 
>     descriptionDone = ['uploaded results']
>     command = ['unzip', zipFile, '-d', resultDirectory]
>Index: Tools/BuildSlaveSupport/ews-build/steps_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(revision 239723)
>+++ Tools/BuildSlaveSupport/ews-build/steps_unittest.py	(working copy)
>@@ -872,7 +872,7 @@ class TestUploadBuiltProduct(BuildStepMi
>         self.setProperty('fullPlatform', 'mac-sierra')
>         self.setProperty('configuration', 'release')
>         self.setProperty('architecture', 'x86_64')
>-        self.setProperty('ewspatchid', '1234')
>+        self.setProperty('patch_id', '1234')
>         self.expectHidden(False)
>         self.expectRemoteCommands(
>             Expect('uploadFile', dict(
>@@ -1180,7 +1180,7 @@ class TestUploadTestResults(BuildStepMix
>         self.setupStep(UploadTestResults())
>         self.setProperty('configuration', 'release')
>         self.setProperty('architecture', 'x86_64')
>-        self.setProperty('ewspatchid', '1234')
>+        self.setProperty('patch_id', '1234')
>         self.setProperty('buildername', 'macOS-Sierra-Release-WK2-Tests-EWS')
>         self.setProperty('buildnumber', '12')
>         self.expectHidden(False)
>@@ -1210,7 +1210,7 @@ class TestExtractTestResults(BuildStepMi
>     def test_success(self):
>         self.setupStep(ExtractTestResults())
>         self.setProperty('configuration', 'release')
>-        self.setProperty('ewspatchid', '1234')
>+        self.setProperty('patch_id', '1234')
>         self.setProperty('buildername', 'macOS-Sierra-Release-WK2-Tests-EWS')
>         self.setProperty('buildnumber', '12')
>         self.expectLocalCommands(
>@@ -1228,7 +1228,7 @@ class TestExtractTestResults(BuildStepMi
>     def test_failure(self):
>         self.setupStep(ExtractTestResults())
>         self.setProperty('configuration', 'debug')
>-        self.setProperty('ewspatchid', '1234')
>+        self.setProperty('patch_id', '1234')
>         self.setProperty('buildername', 'macOS-Sierra-Release-WK2-Tests-EWS')
>         self.setProperty('buildnumber', '12')
>         self.expectLocalCommands(

Actions: View | Formatted Diff | Diff

Attachments on bug 193235: 358587