Changeset 249100 in webkit

Timestamp:

Aug 26, 2019, 10:08:21 AM (7 years ago)

Author:

aakash_jain@apple.com

Message:

[ews] Add EWS queue for applying watchlist
​https://bugs.webkit.org/show_bug.cgi?id=201072

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/steps.py:

(ApplyWatchList): Build step to apply watchlist.
(ApplyWatchList.init): Set logEnviron to False.
(ApplyWatchList.getResultSummary): Updated the description in case of failure.

• BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
• BuildSlaveSupport/ews-build/factories.py:

(WatchListFactory): Build factory for WatchList.

• BuildSlaveSupport/ews-build/loadConfig.py:
• BuildSlaveSupport/ews-build/config.json:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/config.json (modified) (2 diffs)
• BuildSlaveSupport/ews-build/factories.py (modified) (2 diffs)
• BuildSlaveSupport/ews-build/loadConfig.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/steps.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/config.json

@@ -286 +286 @@
       "platform": "*",
       "workernames": ["ews151"]
+    },
+    {
+      "name": "Apply-WatchList-EWS",
+      "shortname": "watchlist",
+      "factory": "WatchListFactory",
+      "platform": "*",
+      "workernames": ["webkit-misc"]
     },
     {
@@ -454 +461 @@
       "name": "try",
       "port": 5555,
-      "builderNames": ["Bindings-Tests-EWS", "GTK-Webkit2-EWS", "iOS-12-Build-EWS", "iOS-12-Simulator-Build-EWS",
+      "builderNames": ["Apply-WatchList-EWS", "Bindings-Tests-EWS", "GTK-Webkit2-EWS", "iOS-12-Build-EWS", "iOS-12-Simulator-Build-EWS",
                        "macOS-High-Sierra-Debug-Build-EWS", "macOS-High-Sierra-Release-Build-EWS",
                        "Services-EWS", "Style-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS", "WPE-EWS", "WinCairo-EWS"]

trunk/Tools/BuildSlaveSupport/ews-build/factories.py

@@ -25 +25 @@
 from buildbot.steps import trigger
 
-from steps import (ApplyPatch, CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance,
+from steps import (ApplyPatch, ApplyWatchList, CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance,
                    CheckStyle, CompileJSCOnly, CompileJSCOnlyToT, CompileWebKit, ConfigureBuild,
                    DownloadBuiltProduct, ExtractBuiltProduct, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
@@ -176 +176 @@
         self.addStep(RunEWSUnitTests())
         self.addStep(RunEWSBuildbotCheckConfig())
+
+
+class WatchListFactory(Factory):
+    def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, False, triggers, additionalArguments)
+        self.addStep(ApplyWatchList())

trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py

@@ -34 +34 @@
                        JSCTestsFactory, StyleFactory, TestFactory, WPEFactory, WebKitPerlFactory,
                        WebKitPyFactory, WinCairoFactory, WindowsFactory, iOSBuildFactory, iOSTestsFactory,
-                       macOSBuildFactory, macOSWK1Factory, macOSWK2Factory, ServicesFactory)
+                       macOSBuildFactory, macOSWK1Factory, macOSWK2Factory, ServicesFactory, WatchListFactory)
 
 BUILDER_NAME_LENGTH_LIMIT = 70

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -1581 +1581 @@
             configuration += u', Xcode: {}'.format(xcode_version)
         return {u'step': configuration}
+
+
+class ApplyWatchList(shell.ShellCommand):
+    name = 'apply-watch-list'
+    description = ['applying watchilist']
+    descriptionDone = ['Applied WatchList']
+    bug_id = WithProperties('%(bug_id)s')
+    command = ['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', bug_id]
+    haltOnFailure = True
+    flunkOnFailure = True
+
+    def __init__(self, **kwargs):
+        shell.ShellCommand.__init__(self, timeout=2 * 60, logEnviron=False, **kwargs)
+
+    def getResultSummary(self):
+        if self.results != SUCCESS:
+            return {u'step': u'Failed to apply watchlist'}
+        return super(ApplyWatchList, self).getResultSummary()

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -35 +35 @@
 from twisted.trial import unittest
 
-from steps import (AnalyzeAPITestsResults, AnalyzeCompileWebKitResults, AnalyzeLayoutTestsResults, ApplyPatch, ArchiveBuiltProduct, ArchiveTestResults,
+from steps import (AnalyzeAPITestsResults, AnalyzeCompileWebKitResults, AnalyzeLayoutTestsResults, ApplyPatch, ApplyWatchList, ArchiveBuiltProduct, ArchiveTestResults,
                    CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance, CheckStyle, CleanBuild, CleanUpGitIndexLock, CleanWorkingDirectory,
                    CompileJSCOnly, CompileJSCOnlyToT, CompileWebKit, CompileWebKitToT, ConfigureBuild,
@@ -294 +294 @@
         )
         self.expectOutcome(result=FAILURE, state_string='check-webkit-style (failure)')
+        return self.runStep()
+
+
+class TestApplyWatchList(BuildStepMixinAdditions, unittest.TestCase):
+    def setUp(self):
+        self.longMessage = True
+        return self.setUpBuildStep()
+
+    def tearDown(self):
+        return self.tearDownBuildStep()
+
+    def test_success(self):
+        self.setupStep(ApplyWatchList())
+        self.setProperty('bug_id', '1234')
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        timeout=120,
+                        logEnviron=False,
+                        command=['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+            + ExpectShell.log('stdio', stdout='Result of watchlist: cc "" messages ""')
+            + 0,
+        )
+        self.expectOutcome(result=SUCCESS, state_string='Applied WatchList')
+        return self.runStep()
+
+    def test_failure(self):
+        self.setupStep(ApplyWatchList())
+        self.setProperty('bug_id', '1234')
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        timeout=120,
+                        logEnviron=False,
+                        command=['python', 'Tools/Scripts/webkit-patch', 'apply-watchlist-local', '1234'])
+            + ExpectShell.log('stdio', stdout='Unexpected failure')
+            + 2,
+        )
+        self.expectOutcome(result=FAILURE, state_string='Failed to apply watchlist')
         return self.runStep()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-08-26  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews] Add EWS queue for applying watchlist
+        https://bugs.webkit.org/show_bug.cgi?id=201072
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (ApplyWatchList): Build step to apply watchlist.
+        (ApplyWatchList.__init__): Set logEnviron to False.
+        (ApplyWatchList.getResultSummary): Updated the description in case of failure.
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
+        * BuildSlaveSupport/ews-build/factories.py:
+        (WatchListFactory): Build factory for WatchList.
+        * BuildSlaveSupport/ews-build/loadConfig.py:
+        * BuildSlaveSupport/ews-build/config.json:
+
 2019-08-26  Youenn Fablet  <youenn@apple.com>