[ews-build] Enable wincairo queue on new EWS
https://bugs.webkit.org/show_bug.cgi?id=199593
Reviewed by Don Olmstead.
* BuildSlaveSupport/ews-build/config.json: Enabled the triggers for wincairo builder.
* BuildSlaveSupport/ews-build/factories.py: Added required build steps for wincairo factory.
* BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
(StatusBubble): Enable wincairo status-bubble.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@247412 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py b/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
index d003dc5..effff77 100644
--- a/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
+++ b/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py
@@ -39,9 +39,9 @@
class StatusBubble(View):
# 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', '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']
+ ALL_QUEUES = ['ios', 'gtk', 'wpe', 'wincairo', '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']
+ ENABLED_QUEUES = ['ios', 'gtk', 'wpe', 'wincairo', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy']
# FIXME: Auto-generate the queue's trigger relationship
QUEUE_TRIGGERS = {
'api-ios': 'ios-sim',
diff --git a/Tools/BuildSlaveSupport/ews-build/config.json b/Tools/BuildSlaveSupport/ews-build/config.json
index e863af2..4ed4de5 100644
--- a/Tools/BuildSlaveSupport/ews-build/config.json
+++ b/Tools/BuildSlaveSupport/ews-build/config.json
@@ -447,14 +447,14 @@
"name": "try",
"port": 5555,
"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"]
+ "macOS-High-Sierra-Release-Build-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS", "WPE-EWS", "WinCairo-EWS"]
},
{
"type": "Try_Userpass",
"name": "disabled",
"port": 5556,
"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"]
+ "macOS-High-Sierra-Release-WK1-Tests-EWS", "macOS-High-Sierra-Debug-Build-EWS", "Style-EWS", "Windows-EWS"]
},
{
"type": "Triggerable",
diff --git a/Tools/BuildSlaveSupport/ews-build/factories.py b/Tools/BuildSlaveSupport/ews-build/factories.py
index 6075c9d..3f0d4df 100644
--- a/Tools/BuildSlaveSupport/ews-build/factories.py
+++ b/Tools/BuildSlaveSupport/ews-build/factories.py
@@ -138,7 +138,10 @@
class WinCairoFactory(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(CompileWebKit(skipUpload=True))
class GTKFactory(Factory):
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c32615d..15c742c 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,17 @@
2019-07-12 Aakash Jain <aakash_jain@apple.com>
+ [ews-build] Enable wincairo queue on new EWS
+ https://bugs.webkit.org/show_bug.cgi?id=199593
+
+ Reviewed by Don Olmstead.
+
+ * BuildSlaveSupport/ews-build/config.json: Enabled the triggers for wincairo builder.
+ * BuildSlaveSupport/ews-build/factories.py: Added required build steps for wincairo factory.
+ * BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+ (StatusBubble): Enable wincairo status-bubble.
+
+2019-07-12 Aakash Jain <aakash_jain@apple.com>
+
[ews-app] Enable logging for clicking SubmitToEWS button
https://bugs.webkit.org/show_bug.cgi?id=199757
