Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (255081 => 255082)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2020-01-24 18:53:04 UTC (rev 255081)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2020-01-24 18:57:05 UTC (rev 255082)
@@ -50,8 +50,6 @@
{ "name": "bot667", "platform": "ios-simulator-13"},
{ "name": "bot664", "platform": "ios-simulator-13"},
- { "name": "bot543", "platform": "win" },
- { "name": "bot544", "platform": "win" },
{ "name": "bot545", "platform": "win" },
{ "name": "bot546", "platform": "win" },
{ "name": "bot547", "platform": "win" },
@@ -254,17 +252,6 @@
"slavenames": ["bot545"]
},
{
- "name": "Apple Win 7 Release (Build)", "type": "Build", "builddir": "win7-release-i386",
- "platform": "win", "configuration": "release", "architectures": ["i386"],
- "triggers": ["win7-release-tests"],
- "slavenames": ["bot544"]
- },
- {
- "name": "Apple Win 7 Release (Tests)", "type": "TestWebKit1", "builddir": "win7-release-tests",
- "platform": "win", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["bot543"]
- },
- {
"name": "GTK Linux 64-bit Release (Build)", "type": "BuildAndGenerateJSCBundle", "builddir": "gtk-linux-64-release",
"platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
"triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-wayland-tests", "gtk-linux-64-release-perf-tests"],
@@ -455,7 +442,7 @@
"builderNames": ["Apple iOS 13 Simulator Release (Build)", "Apple iOS 13 Simulator Debug (Build)"]
},
{ "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
- "builderNames": ["Apple Win 7 Release (Build)", "Apple Win 10 Release (Build)", "Apple Win 10 Debug (Build)"]
+ "builderNames": ["Apple Win 10 Release (Build)", "Apple Win 10 Debug (Build)"]
},
{ "type": "Triggerable", "name": "ios-simulator-13-release-tests-wk2",
"builderNames": ["Apple iOS 13 Simulator Release WK2 (Tests)"]
@@ -475,9 +462,6 @@
{ "type": "Triggerable", "name": "win10-debug-tests",
"builderNames": ["Apple Win 10 Debug (Tests)"]
},
- { "type": "Triggerable", "name": "win7-release-tests",
- "builderNames": ["Apple Win 7 Release (Tests)"]
- },
{ "type": "Triggerable", "name": "gtk-linux-64-release-tests",
"builderNames": ["GTK Linux 64-bit Release (Tests)"]
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (255081 => 255082)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2020-01-24 18:53:04 UTC (rev 255081)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2020-01-24 18:57:05 UTC (rev 255082)
@@ -31,7 +31,6 @@
iOS13Simulator: { name: "ios-simulator-13", readableName: "iOS 13 Simulator", order: 20 },
iOS13Device: { name: "ios-13", readableName: "iOS 13", order: 25 },
Windows10: { name: "windows-10", readableName: "Windows 10", order: 30 },
- Windows7: { name: "windows-7", readableName: "Windows 7", order: 35 },
WinCairo: { name: "wincairo-windows-10", readableName: "WinCairo", order: 50 },
LinuxWPE: { name : "linux-wpe", readableName: "Linux WPE", order: 90 },
LinuxGTK: { name : "linux-gtk", readableName: "Linux GTK", order: 91 },
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css (255081 => 255082)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css 2020-01-24 18:53:04 UTC (rev 255081)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css 2020-01-24 18:57:05 UTC (rev 255082)
@@ -191,10 +191,6 @@
content: "WinCairo";
}
-table.queue-grid tr.platform.windows-7 td.logo::before {
- content: "Windows 7";
-}
-
table.queue-grid tr.platform.ios-simulator-13 img.logo {
background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/IOS13Simulator.png) 1x);
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (255081 => 255082)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-01-24 18:53:04 UTC (rev 255081)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-01-24 18:57:05 UTC (rev 255082)
@@ -520,8 +520,6 @@
expected_build_steps = {
- 'Apple Win 7 Release (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
- 'Apple Win 7 Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile', 'compile-webkit', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
'Apple Win 10 Debug (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
'Apple Win 10 Release (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile', 'download-built-product', 'extract-built-product', 'jscore-test', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
'Apple Win 10 Debug (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile', 'compile-webkit', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
Modified: trunk/Tools/ChangeLog (255081 => 255082)
--- trunk/Tools/ChangeLog 2020-01-24 18:53:04 UTC (rev 255081)
+++ trunk/Tools/ChangeLog 2020-01-24 18:57:05 UTC (rev 255082)
@@ -1,3 +1,17 @@
+2020-01-23 Matt Lewis <[email protected]>
+
+ Remove Apple windows 7 queues.
+ https://bugs.webkit.org/show_bug.cgi?id=206702
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
+ * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
+ Removed Windows 7 queues from config and from dashboard.
+
2020-01-24 Per Arne Vollan <[email protected]>
Unreviewed, rolling out r255050.
