Changeset 247131 in webkit

Timestamp:

Jul 3, 2019 6:45:38 PM (5 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-build] Enable WPE and GTK queues on new EWS
​https://bugs.webkit.org/show_bug.cgi?id=199234

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/config.json: Enabled the triggers for GTK and WPE builders.
• BuildSlaveSupport/ews-build/factories.py: Added required build steps for GTKFactory and WPEFactory.
• BuildSlaveSupport/ews-build/steps.py:

(CompileWebKit.evaluateCommand): Added InstallGtkDependencies/InstallWpeDependencies step before Compiling WebKit without patch.

• BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
• BuildSlaveSupport/ews-app/ews/views/statusbubble.py:

(StatusBubble): Enable gtk and wpe status-bubbles.

Location:

trunk/Tools

Files:

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

trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py

@@ -40 +40 @@
     # These queue names are from shortname in https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/ews-build/config.json
     # FIXME: Auto-generate this list https://bugs.webkit.org/show_bug.cgi?id=195640
-    ALL_QUEUES = ['ios', 'api-ios', 'api-mac', 'bindings', 'gtk', 'ios-sim', 'ios-wk2', 'jsc', 'mac', 'mac-32bit', 'mac-32bit-wk2',
-                    'mac-debug', 'mac-debug-wk1', 'mac-wk1', 'mac-wk2', 'style', 'webkitperl', 'webkitpy', 'win', 'wincairo', 'wpe']
-    ENABLED_QUEUES = ['ios', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy']
+    ALL_QUEUES = ['ios', 'gtk', 'wpe', 'api-ios', 'api-mac', 'bindings', 'ios-sim', 'ios-wk2', 'jsc', 'mac', 'mac-32bit', 'mac-32bit-wk2',
+                    'mac-debug', 'mac-debug-wk1', 'mac-wk1', 'mac-wk2', 'style', 'webkitperl', 'webkitpy', 'win', 'wincairo']
+    ENABLED_QUEUES = ['ios', 'gtk', 'wpe', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy']
     # FIXME: Auto-generate the queue's trigger relationship
     QUEUE_TRIGGERS = {

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

@@ -455 +455 @@
       "name": "try",
       "port": 5555,
-      "builderNames": ["Bindings-Tests-EWS", "iOS-12-Build-EWS", "iOS-12-Simulator-Build-EWS",
-                       "macOS-High-Sierra-Release-Build-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS"]
+      "builderNames": ["Bindings-Tests-EWS", "GTK-Webkit2-EWS", "iOS-12-Build-EWS", "iOS-12-Simulator-Build-EWS",
+                       "macOS-High-Sierra-Release-Build-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS", "WPE-EWS"]
     },
     {
@@ -462 +462 @@
       "name": "disabled",
       "port": 5556,
-      "builderNames": ["GTK-Webkit2-EWS", "JSC-Tests-EWS",
-                       "iOS-12-Simulator-WK2-Tests-EWS", "macOS-High-Sierra-Release-WK2-Tests-EWS",  "macOS-High-Sierra-Release-WK1-Tests-EWS",
-                       "macOS-High-Sierra-Debug-Build-EWS", "Style-EWS", "WinCairo-EWS", "Windows-EWS", "WPE-EWS"]
+      "builderNames": ["JSC-Tests-EWS", "iOS-12-Simulator-WK2-Tests-EWS", "macOS-High-Sierra-Release-WK2-Tests-EWS",
+                       "macOS-High-Sierra-Release-WK1-Tests-EWS", "macOS-High-Sierra-Debug-Build-EWS", "Style-EWS", "WinCairo-EWS", "Windows-EWS"]
     },
     {

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

@@ -27 +27 @@
 from steps import (ApplyPatch, CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance,
                    CheckStyle, CompileJSCOnly, CompileJSCOnlyToT, CompileWebKit, ConfigureBuild,
-                   DownloadBuiltProduct, ExtractBuiltProduct, KillOldProcesses,
+                   DownloadBuiltProduct, ExtractBuiltProduct, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
                    PrintConfiguration, ReRunJavaScriptCoreTests, RunAPITests, RunBindingsTests,
                    RunJavaScriptCoreTests, RunJavaScriptCoreTestsToT, RunWebKit1Tests, RunWebKitPerlTests,
@@ -113 +113 @@
 
 
-class GTKFactory(Factory):
-    pass
-
-
 class iOSBuildFactory(BuildFactory):
     pass
@@ -145 +141 @@
 
 
+class GTKFactory(Factory):
+    def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, True, triggers, additionalArguments)
+        self.addStep(KillOldProcesses())
+        self.addStep(InstallGtkDependencies())
+        self.addStep(CompileWebKit(skipUpload=True))
+
+
 class WPEFactory(Factory):
-    pass
+    def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, True, triggers, additionalArguments)
+        self.addStep(KillOldProcesses())
+        self.addStep(InstallWpeDependencies())
+        self.addStep(CompileWebKit(skipUpload=True))

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

@@ -672 +672 @@
         if cmd.didFail():
             self.setProperty('patchFailedToBuild', True)
-            self.build.addStepsAfterCurrentStep([UnApplyPatchIfRequired(), CompileWebKitToT(), AnalyzeCompileWebKitResults()])
+            steps_to_add = [UnApplyPatchIfRequired()]
+            platform = self.getProperty('platform')
+            if platform == 'wpe':
+                steps_to_add.append(InstallWpeDependencies())
+            elif platform == 'gtk':
+                steps_to_add.append(InstallGtkDependencies())
+            steps_to_add.append(CompileWebKitToT())
+            steps_to_add.append(AnalyzeCompileWebKitResults())
+            # Using a single addStepsAfterCurrentStep because of https://github.com/buildbot/buildbot/issues/4874
+            self.build.addStepsAfterCurrentStep(steps_to_add)
         else:
             triggers = self.getProperty('triggers', None)

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

@@ -567 +567 @@
                         logEnviron=False,
                         command=['perl', 'Tools/Scripts/build-webkit', '--release'],
+                        )
+            + 0,
+        )
+        self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
+        return self.runStep()
+
+    def test_success_gtk(self):
+        self.setupStep(CompileWebKit())
+        self.setProperty('platform', 'gtk')
+        self.setProperty('fullPlatform', 'gtk')
+        self.setProperty('configuration', 'release')
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        logEnviron=False,
+                        command=['perl', 'Tools/Scripts/build-webkit', '--release', '--gtk'],
+                        )
+            + 0,
+        )
+        self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
+        return self.runStep()
+
+    def test_success_wpe(self):
+        self.setupStep(CompileWebKit())
+        self.setProperty('platform', 'wpe')
+        self.setProperty('fullPlatform', 'wpe')
+        self.setProperty('configuration', 'release')
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        logEnviron=False,
+                        command=['perl', 'Tools/Scripts/build-webkit', '--release', '--wpe'],
                         )
             + 0,

trunk/Tools/ChangeLog

@@ +1 @@
+2019-07-03  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Enable WPE and GTK queues on new EWS
+        https://bugs.webkit.org/show_bug.cgi?id=199234
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/config.json: Enabled the triggers for GTK and WPE builders.
+        * BuildSlaveSupport/ews-build/factories.py: Added required build steps for GTKFactory and WPEFactory.
+        * BuildSlaveSupport/ews-build/steps.py:
+        (CompileWebKit.evaluateCommand): Added InstallGtkDependencies/InstallWpeDependencies step before Compiling WebKit without patch.
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
+        * BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+        (StatusBubble): Enable gtk and wpe status-bubbles.
+
 2019-07-03  Sihui Liu  <sihui_liu@apple.com>