Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (239781 => 239782)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-01-09 20:47:11 UTC (rev 239781)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-01-09 21:56:53 UTC (rev 239782)
@@ -79,7 +79,7 @@
def propertiesToPassToTriggers(self):
return {
- "ewspatchid": Property("ewspatchid"),
+ "patch_id": Property("patch_id"),
"configuration": Property("configuration"),
"platform": Property("platform"),
"fullPlatform": Property("fullPlatform"),
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (239781 => 239782)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-01-09 20:47:11 UTC (rev 239781)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-01-09 21:56:53 UTC (rev 239782)
@@ -627,7 +627,7 @@
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 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 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 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]
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (239781 => 239782)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-01-09 20:47:11 UTC (rev 239781)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-01-09 21:56:53 UTC (rev 239782)
@@ -872,7 +872,7 @@
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 @@
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 @@
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 @@
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(
Modified: trunk/Tools/ChangeLog (239781 => 239782)
--- trunk/Tools/ChangeLog 2019-01-09 20:47:11 UTC (rev 239781)
+++ trunk/Tools/ChangeLog 2019-01-09 21:56:53 UTC (rev 239782)
@@ -1,3 +1,14 @@
+2019-01-09 Aakash Jain <aakash_j...@apple.com>
+
+ [ews-build] use patch_id instead of ewspatchid
+ https://bugs.webkit.org/show_bug.cgi?id=193235
+
+ Reviewed by Lucas Forschler.
+
+ * 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-09 Zalan Bujtas <za...@apple.com>
[LFC][BFC][MarginCollapsing] Add support for peculiar cases.
