[ews-build] use patch_id instead of ewspatchid
authoraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Jan 2019 21:56:53 +0000 (21:56 +0000)
committeraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Jan 2019 21:56:53 +0000 (21:56 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/BuildSlaveSupport/ews-build/factories.py
Tools/BuildSlaveSupport/ews-build/steps.py
Tools/BuildSlaveSupport/ews-build/steps_unittest.py
Tools/ChangeLog

index 18aedba..0b75e40 100644 (file)
@@ -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 a8ed578..1587fe9 100644 (file)
@@ -627,7 +627,7 @@ class ArchiveBuiltProduct(shell.ShellCommand):
 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.FileUpload):
 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.ShellCommand):
 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.FileUpload):
 
 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 e3a7afd..9bc5d07 100644 (file)
@@ -872,7 +872,7 @@ class TestUploadBuiltProduct(BuildStepMixinAdditions, unittest.TestCase):
         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(BuildStepMixinAdditions, unittest.TestCase):
         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(BuildStepMixinAdditions, unittest.TestCase):
     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(BuildStepMixinAdditions, unittest.TestCase):
     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(
index f49bfa1..dc38ea0 100644 (file)
@@ -1,3 +1,14 @@
+2019-01-09  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 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  <zalan@apple.com>
 
         [LFC][BFC][MarginCollapsing] Add support for peculiar cases.