Attachment 359947 Details for Bug 193739 – Patch

[patch] Patch

bug-193739-20190123150408.patch (text/plain), 8.68 KB, created by Ryan Haddad on 2019-01-23 15:04:09 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan Haddad

Created: 2019-01-23 15:04:09 PST

Size: 8.68 KB

patch

obsolete

>Subversion Revision: 240347
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a0c6b0d0ed5e1ef6b9060c7b98fda543985bdd6f..4270e945cdf24a7d4caf176b52037cef1e95e2df 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-23  Ryan Haddad  <ryanhaddad@apple.com>
>+
>+        Update macOS JSC bot configurations
>+        https://bugs.webkit.org/show_bug.cgi?id=193739
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/build.webkit.org-config/config.json: Remove 32-bit BuildAndTest queue.
>+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js:
>+        (BubbleQueueServer): Move JSC EWS to Mojave section.
>+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
>+        (WebKitBuildbot): Remove 32-bit BuildAndTest queue from dashboard.
>+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Update unit test.
>+
> 2019-01-23  Jonathan Bedard  <jbedard@apple.com>
> 
>         webkitpy: Use correct config for --iphone-simulator and --ipad-simulator
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>index da4072f0262079dc18e6dcc75a930c55252d9a9a..2bd10e7a9854c913b433cf479e28eebb85a24050 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
>@@ -21,7 +21,6 @@
>                     { "name": "bot163", "platform": "mac-highsierra" },
>                     { "name": "bot182", "platform": "mac-highsierra" },
>                     { "name": "bot186", "platform": "mac-highsierra" },
>-                    { "name": "bot187", "platform": "mac-highsierra" },
>                     { "name": "bot194", "platform": "mac-highsierra" },
>                     { "name": "bot197", "platform": "mac-highsierra" },
>                     { "name": "bot205", "platform": "mac-highsierra" },
>@@ -166,10 +165,6 @@
>                       "platform": "mac-highsierra", "configuration": "debug", "architectures": ["x86_64"],
>                       "slavenames": ["bot186"]
>                     },
>-                    { "name": "Apple High Sierra 32-bit JSC (BuildAndTest)", "type": "BuildAndTest32bitJSC", "builddir": "highsierra-32bitJSC-debug",
>-                      "platform": "mac-highsierra", "configuration": "debug", "architectures": ["i386"],
>-                      "slavenames": ["bot187"]
>-                    },
>                     { "name": "Apple High Sierra Debug Test262 (Tests)", "type": "Test262", "builddir": "highsierra-debug-tests-test262",
>                       "platform": "mac-highsierra", "configuration": "debug", "architectures": ["x86_64"],
>                       "slavenames": ["bot603"]
>@@ -400,7 +395,7 @@
>                       "builderNames": ["Apple Mojave (Leaks)"]
>                     },
>                     { "type": "PlatformSpecificScheduler", "platform": "mac-highsierra", "branch": "trunk", "treeStableTimer": 45.0,
>-                      "builderNames": ["Apple High Sierra Release (Build)", "Apple High Sierra Debug (Build)", "Apple High Sierra Release (32-bit Build)", "Apple High Sierra LLINT CLoop (BuildAndTest)", "Apple High Sierra 32-bit JSC (BuildAndTest)"]
>+                      "builderNames": ["Apple High Sierra Release (Build)", "Apple High Sierra Debug (Build)", "Apple High Sierra Release (32-bit Build)", "Apple High Sierra LLINT CLoop (BuildAndTest)"]
>                     },
>                     { "type": "PlatformSpecificScheduler", "platform": "ios-12", "branch": "trunk", "treeStableTimer": 45.0,
>                       "builderNames": ["Apple iOS 12 Release (Build)"]
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js
>index f4cf2abe8353035a1be1fd096d94836faf5ec0e7..6725f801fff39718011ea2afdb69c462b01defe2 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js
>@@ -32,7 +32,7 @@ BubbleQueueServer = function()
>         "ios-ews": {platform: Dashboard.Platform.iOS12Device, shortName: "ios", title: "Release\xa0Build\xa0EWS"},
>         "ios-sim-ews": {platform: Dashboard.Platform.iOS12Simulator, shortName: "ios-sim", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
>         "jsc-armv7-ews": {platform: Dashboard.Platform.LinuxJSCOnly, shortName: "jsc-armv7", title: "ARMv7\xa0Release\xa0Build\xa0EWS"},
>-        "jsc-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "jsc", title: "Release\xa0JSC\xa0Tests\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-32bit-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "mac-32bit", title: "Release\xa032\u2011bit\xa0Build\xa0EWS"},
>         "mac-ews": {platform: Dashboard.Platform.macOSHighSierra, shortName: "mac", title: "WebKit1\xa0Release\xa0Tests\xa0EWS"},
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
>index edd2e7b271dcb50974b2c2585d2bbbf3fb9f628c..57fbda1d079216b682a12eccc75a6d7981275fd1 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
>@@ -42,7 +42,6 @@ WebKitBuildbot = function()
>         "Apple High Sierra Release WK2 (Perf)": {platform: Dashboard.Platform.macOSHighSierra, debug: false, performance: true, heading: "Performance"},
>         "Apple High Sierra Release WK2 (Tests)": {platform: Dashboard.Platform.macOSHighSierra, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
>         "Apple High Sierra JSC": {platform: Dashboard.Platform.macOSHighSierra, heading: "JavaScript", combinedQueues: {
>-            "Apple High Sierra 32-bit JSC (BuildAndTest)": {heading: "32-bit JSC (BuildAndTest)"},
>             "Apple High Sierra LLINT CLoop (BuildAndTest)": {heading: "LLINT CLoop (BuildAndTest)"},
>             "Apple High Sierra Debug JSC (Tests)": {heading: "Debug JSC (Tests)"},
>             "Apple High Sierra Release JSC (Tests)": {heading: "Release JSC (Tests)"},
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py b/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>index eb9dbc452cbec126bee0031a69677b680993f88f..5297d3f75d9cc4ec87914a981ccc2b32366038c1 100755
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>@@ -523,7 +523,6 @@ expected_build_steps = {
>     'Apple Mojave Release WK1 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
>     'Apple Mojave Release WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
> 
>-    'Apple High Sierra 32-bit JSC (BuildAndTest)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'webkit-32bit-jsc-test'],
>     'Apple High Sierra Debug (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
>     'Apple High Sierra Debug JSC (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'jscore-test'],
>     'Apple High Sierra Debug Test262 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'test262-test'],

Actions: View | Formatted Diff | Diff

Attachments on bug 193739: 359947