Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js (248087 => 248088)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js 2019-08-01 01:01:53 UTC (rev 248087)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js 2019-08-01 01:17:09 UTC (rev 248088)
@@ -31,9 +31,6 @@
"jsc-armv7-ews": {platform: Dashboard.Platform.LinuxJSCOnly, shortName: "jsc-armv7", title: "ARMv7\xa0Release\xa0Build\xa0EWS"},
"jsc-ews": {platform: Dashboard.Platform.macOSMojave, shortName: "jsc", title: "Release\xa0JSC\xa0Tests\xa0EWS"},
"jsc-mips-ews": {platform: Dashboard.Platform.LinuxJSCOnly, shortName: "jsc-mips-ews", title: "MIPS\xa0Release\xa0Build\xa0EWS"},
- "mac-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "mac", title: "WebKit1\xa0Release\xa0Tests\xa0EWS"},
- "mac-wk2-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "mac-wk2", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
- "mac-debug-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "mac-debug", title: "WebKit1\xa0Debug\xa0Tests\xa0EWS"},
"win-ews": {platform: Dashboard.Platform.Windows10, shortName: "win", title: "WebKit1\xa0Release\xa0Build\xa0EWS"},
};
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py (248087 => 248088)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-08-01 01:01:53 UTC (rev 248087)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py 2019-08-01 01:17:09 UTC (rev 248088)
@@ -39,9 +39,10 @@
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', 'ios-sim', 'gtk', 'wpe', 'wincairo', 'ios-wk2', 'api-ios', 'api-mac', 'bindings', 'jsc', 'mac', 'mac-32bit', 'mac-32bit-wk2',
- 'mac-debug', 'mac-debug-wk1', 'mac-wk1', 'mac-wk2', 'style', 'webkitperl', 'webkitpy', 'win', 'services']
- ENABLED_QUEUES = ['ios', 'ios-sim', 'gtk', 'wpe', 'wincairo', 'ios-wk2', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy', 'services']
+ ALL_QUEUES = ['ios', 'ios-sim', 'mac', 'mac-debug', 'gtk', 'wpe', 'wincairo',
+ 'ios-wk2', 'mac-wk1', 'mac-wk2', 'mac-debug-wk1', 'api-ios', 'api-mac', 'bindings', 'jsc', 'style', 'webkitperl', 'webkitpy', 'win', 'services']
+ ENABLED_QUEUES = ['ios', 'ios-sim', 'mac', 'mac-debug', 'gtk', 'wpe', 'wincairo',
+ 'ios-wk2', 'mac-wk1', 'mac-wk2', 'mac-debug-wk1', 'api-ios', 'api-mac', 'bindings', 'webkitperl', 'webkitpy', 'services']
# FIXME: Auto-generate the queue's trigger relationship
QUEUE_TRIGGERS = {
'api-ios': 'ios-sim',
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (248087 => 248088)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-08-01 01:01:53 UTC (rev 248087)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2019-08-01 01:17:09 UTC (rev 248088)
@@ -330,7 +330,7 @@
"platform": "mac-highsierra",
"configuration": "release",
"architectures": ["x86_64"],
- "triggers": ["api-tests-mac-ews"],
+ "triggers": ["api-tests-mac-ews", "macos-high-sierra-release-wk1-tests-ews", "macos-high-sierra-release-wk2-tests-ews"],
"workernames": ["ews118", "ews119", "ews120", "ews150"]
},
{
@@ -454,14 +454,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", "Services-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS", "WPE-EWS", "WinCairo-EWS"]
+ "macOS-High-Sierra-Debug-Build-EWS", "macOS-High-Sierra-Release-Build-EWS",
+ "Services-EWS", "WebKitPerl-Tests-EWS", "WebKitPy-Tests-EWS", "WPE-EWS", "WinCairo-EWS"]
},
{
"type": "Try_Userpass",
"name": "disabled",
"port": 5556,
- "builderNames": ["JSC-Tests-EWS", "macOS-High-Sierra-Release-WK2-Tests-EWS",
- "macOS-High-Sierra-Release-WK1-Tests-EWS", "macOS-High-Sierra-Debug-Build-EWS", "Style-EWS", "Windows-EWS"]
+ "builderNames": ["JSC-Tests-EWS", "Style-EWS", "Windows-EWS"]
},
{
"type": "Triggerable",
@@ -472,6 +472,20 @@
},
{
"type": "Triggerable",
+ "name": "macos-high-sierra-release-wk1-tests-ews",
+ "builderNames": [
+ "macOS-High-Sierra-Release-WK1-Tests-EWS"
+ ]
+ },
+ {
+ "type": "Triggerable",
+ "name": "macos-high-sierra-release-wk2-tests-ews",
+ "builderNames": [
+ "macOS-High-Sierra-Release-WK2-Tests-EWS"
+ ]
+ },
+ {
+ "type": "Triggerable",
"name": "ios-12-sim-wk2-tests-ews",
"builderNames": [
"iOS-12-Simulator-WK2-Tests-EWS"
Modified: trunk/Tools/ChangeLog (248087 => 248088)
--- trunk/Tools/ChangeLog 2019-08-01 01:01:53 UTC (rev 248087)
+++ trunk/Tools/ChangeLog 2019-08-01 01:17:09 UTC (rev 248088)
@@ -1,3 +1,17 @@
+2019-07-31 Aakash Jain <[email protected]>
+
+ [ews-build] Enable all macOS queues on new EWS
+ https://bugs.webkit.org/show_bug.cgi?id=199944
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-build/config.json: Enabled the triggers for macOS queues.
+ * BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+ (StatusBubble): Enabled status-bubbles for mac queues, separated builders and testers bubbles in separate lines. Also
+ removed mac-32bit and mac-32bit-wk2 bubbles, these queues were removed from Buildbot configuration previously.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js: Removed mac queues from bot-watcher's dashboard.
+ * QueueStatusServer/config/queues.py: Removed mac queues from old EWS.
+
2019-07-31 Ryan Haddad <[email protected]>
Unreviewed test gardening, disable failing test for rdar://51752593.
Modified: trunk/Tools/QueueStatusServer/config/queues.py (248087 => 248088)
--- trunk/Tools/QueueStatusServer/config/queues.py 2019-08-01 01:01:53 UTC (rev 248087)
+++ trunk/Tools/QueueStatusServer/config/queues.py 2019-08-01 01:17:09 UTC (rev 248088)
@@ -37,9 +37,6 @@
"jsc-mips-ews",
"jsc-armv7-ews",
"jsc-i386-ews",
- "mac-ews",
- "mac-wk2-ews",
- "mac-debug-ews",
"win-ews",
]
