Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2017-02-15 22:42:16 UTC (rev 212396)
@@ -73,9 +73,6 @@
{ "name": "gtk-linux-slave-8", "platform": "gtk" },
{ "name": "gtk-linux-slave-9", "platform": "gtk" },
- { "name": "efl-linux-slave-2", "platform": "efl" },
- { "name": "efl-linux-slave-3", "platform": "efl" },
-
{ "name": "jsconly-linux-szeged-slave-1", "platform": "jsc-only" },
{ "name": "jsconly-linux-szeged-slave-2", "platform": "jsc-only" },
{ "name": "jsconly-linux-szeged-slave-3", "platform": "jsc-only" }
@@ -310,16 +307,6 @@
"slavenames": ["wincairo-1", "wincairo-2"]
},
{
- "name": "EFL Linux 64-bit Release WK2", "type": "BuildAndTest", "builddir": "efl-linux-64-release-wk2",
- "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
- "slavenames": ["efl-linux-slave-2"]
- },
- {
- "name": "EFL Linux 64-bit Release WK2 (Perf)", "type": "BuildAndPerfTest", "builddir": "efl-linux-64-release-wk2-perf",
- "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
- "slavenames": ["efl-linux-slave-3"]
- },
- {
"name": "JSCOnly Linux AArch64 Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-aarch64-release",
"platform": "jsc-only", "configuration": "release", "architectures": ["aarch64"],
"SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",
@@ -341,7 +328,6 @@
"schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "change_filter": "trunk_filter", "treeStableTimer": 45.0,
"builderNames": ["GTK Linux 32-bit Release", "GTK Linux 64-bit Release (Build)", "GTK Linux 64-bit Debug (Build)", "GTK Linux ARM Release",
- "EFL Linux 64-bit Release WK2", "EFL Linux 64-bit Release WK2 (Perf)",
"JSCOnly Linux AArch64 Release", "JSCOnly Linux ARMv7 Thumb2 Release", "JSCOnly Linux ARMv7 Traditional Release",
"WinCairo 64-Bit Release"]
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2017-02-15 22:42:16 UTC (rev 212396)
@@ -176,13 +176,6 @@
return SKIPPED
return shell.Compile.start(self)
-class InstallEflDependencies(shell.ShellCommand):
- name = "jhbuild"
- description = ["updating efl dependencies"]
- descriptionDone = ["updated efl dependencies"]
- command = ["perl", "./Tools/Scripts/update-webkitefl-libs"]
- haltOnFailure = True
-
class InstallGtkDependencies(shell.ShellCommand):
name = "jhbuild"
description = ["updating gtk dependencies"]
@@ -191,7 +184,7 @@
haltOnFailure = True
def appendCustomBuildFlags(step, platform, fullPlatform):
- if platform not in ('efl', 'gtk', 'wincairo', 'ios', 'jsc-only'):
+ if platform not in ('gtk', 'wincairo', 'ios', 'jsc-only'):
return
if fullPlatform.startswith('ios-simulator'):
platform = 'ios-simulator'
@@ -351,8 +344,7 @@
appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
additionalArguments = self.getProperty('additionalArguments')
- if platform != "efl":
- self.setCommand(self.command + ['--debug-rwt-logging'])
+ self.setCommand(self.command + ['--debug-rwt-logging'])
if platform == "win":
self.setCommand(self.command + ['--batch-size', '100', '--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin32")])
@@ -566,13 +558,6 @@
command = ["python", "./Tools/Scripts/run-builtins-generator-tests"]
-class RunEflAPITests(shell.Test):
- name = "API tests"
- description = ["API tests running"]
- descriptionDone = ["API tests"]
- command = ["perl", "./Tools/Scripts/run-efl-tests", WithProperties("--%(configuration)s")]
-
-
class RunGtkAPITests(shell.Test):
name = "API tests"
description = ["API tests running"]
@@ -790,8 +775,6 @@
self.addStep(InstallWin32Dependencies())
if platform == "gtk":
self.addStep(InstallGtkDependencies())
- if platform == "efl":
- self.addStep(InstallEflDependencies())
class BuildFactory(Factory):
@@ -837,8 +820,6 @@
self.addStep(ArchiveTestResults())
self.addStep(UploadTestResults())
self.addStep(ExtractTestResults())
- if platform == "efl":
- self.addStep(RunEflAPITests())
if platform == "gtk":
self.addStep(RunGtkAPITests())
@@ -995,8 +976,6 @@
builder["category"] = 'AppleWin'
elif platform.startswith('gtk'):
builder["category"] = 'GTK'
- elif platform.startswith('efl'):
- builder["category"] = "EFL"
else:
builder["category"] = 'misc'
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2017-02-15 22:42:16 UTC (rev 212396)
@@ -406,9 +406,6 @@
'Apple iOS 10 Simulator Debug 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', 'archive-test-results', 'upload', 'MasterShellCommand'],
'Apple iOS 10 Simulator Debug 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', 'archive-test-results', 'upload', 'MasterShellCommand'],
- 'EFL Linux 64-bit Release WK2' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
- 'EFL Linux 64-bit Release WK2 (Perf)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'perf-test'],
-
'JSCOnly Linux ARMv7 Thumb2 Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
'JSCOnly Linux ARMv7 Traditional Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
'JSCOnly Linux AArch64 Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2017-02-15 22:42:16 UTC (rev 212396)
@@ -83,27 +83,6 @@
return builderName.indexOf('GTK') != -1;
},
},
- 'efl' : {
- label : 'EFL',
- buildConsoleURL: 'https://build.webkit.org',
- layoutTestResultsURL: 'https://build.webkit.org/results',
- waterfallURL: 'https://build.webkit.org/waterfall',
- builders: {
- 'EFL Linux 64-bit Release WK2' : {version: '64-bit WK2'},
- },
- haveBuilderAccumulatedResults : false,
- useDirectoryListingForOldBuilds: false,
- useFlakinessDashboard: false,
- resultsDirectoryNameFromBuilderName: function(builderName) {
- return encodeURIComponent(builderName);
- },
- resultsDirectoryForBuildNumber: function(buildNumber, revision) {
- return encodeURIComponent('r' + revision + ' (' + buildNumber + ')');
- },
- _builderApplies: function(builderName) {
- return builderName.indexOf('EFL') != -1;
- },
- },
};
config.kTracURL = 'https://trac.webkit.org';
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js 2017-02-15 22:42:16 UTC (rev 212396)
@@ -35,8 +35,7 @@
"mac-wk2-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "mac-wk2", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
"mac-debug-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "mac-debug", title: "WebKit1\xa0Debug\xa0Tests\xa0EWS"},
"mac-32bit-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "mac-32bit", title: "Release\xa032\u2011bit\xa0Build\xa0EWS"},
- "win-ews": {platform: Dashboard.Platform.Windows7, shortName: "win", title: "WebKit1\xa0Release\xa0Build\xa0EWS"},
- "efl-wk2-ews": {platform: Dashboard.Platform.LinuxEFL, shortName: "efl-wk2", title: "WebKit2\xa0Release\xa0Build\xa0EWS"}
+ "win-ews": {platform: Dashboard.Platform.Windows7, shortName: "win", title: "WebKit1\xa0Release\xa0Build\xa0EWS"}
};
BaseObject.call(this);
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js 2017-02-15 22:42:16 UTC (rev 212396)
@@ -32,8 +32,7 @@
Windows8: { name: "windows-8", readableName: "Windows 8", order: 50 },
Windows7: { name: "windows-7", readableName: "Windows 7", order: 60 },
WindowsXP: { name: "windows-xp", readableName: "Windows XP", order: 70 },
- LinuxGTK: { name : "linux-gtk", readableName: "Linux GTK", order: 90 },
- LinuxEFL: { name: "linux-efl", readableName: "Linux EFL", order : 100 }
+ LinuxGTK: { name : "linux-gtk", readableName: "Linux GTK", order: 90 }
},
Branch: {},
Repository: {
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsAnalyzer.js (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsAnalyzer.js 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsAnalyzer.js 2017-02-15 22:42:16 UTC (rev 212396)
@@ -92,7 +92,6 @@
if (this._queues[i].platform === queue.platform && this._queues[i].architecture === queue.architecture && this._queues[i].debug === queue.debug)
return this._queues[i];
}
- // Efl bot both builds and tests, but is registered as tester.
return queue;
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2017-02-15 22:42:16 UTC (rev 212396)
@@ -69,9 +69,7 @@
"GTK Linux 64-bit Release (Tests)": {platform: Dashboard.Platform.LinuxGTK, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
"GTK Linux 64-bit Debug (Build)": {platform: Dashboard.Platform.LinuxGTK, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
"GTK Linux 64-bit Debug (Tests)": {platform: Dashboard.Platform.LinuxGTK, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "GTK Linux 64-bit Release (Perf)": {platform: Dashboard.Platform.LinuxGTK, debug: false, performance: true, heading: "Performance"},
- "EFL Linux 64-bit Release WK2": {platform: Dashboard.Platform.LinuxEFL, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "EFL Linux 64-bit Release WK2 (Perf)": {platform: Dashboard.Platform.LinuxEFL, performance: true, heading: "Performance"}
+ "GTK Linux 64-bit Release (Perf)": {platform: Dashboard.Platform.LinuxGTK, debug: false, performance: true, heading: "Performance"}
};
Buildbot.call(this, "https://build.webkit.org/", queueInfo);
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css 2017-02-15 22:42:16 UTC (rev 212396)
@@ -204,10 +204,6 @@
content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/GTK.png) 1x);
}
-table.queue-grid tr.platform.linux-efl img.logo {
- content: -webkit-image-set(url(../Images/[email protected]) 2x, url(../Images/EFL.png) 1x);
-}
-
.popover-tracking:hover {
text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.2)
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html 2017-02-15 22:42:16 UTC (rev 212396)
@@ -23,11 +23,11 @@
<h2>Buildbot Pages</h2>
<ul>
<li><a href="" - <a href="" Mac</a>, <a href="" Windows</a>, <a href=""
- <a href="" <a href=""
+ <a href=""
and <a href=""
<li><a href="" Display</a>, a time-oriented summary of recent buildbot activity
- <a href="" Mac</a>, <a href="" Windows</a>, <a href=""
- <a href="" <a href=""
+ <a href=""
and <a href=""
<li><a href="" Build</a> for each builder is here.</li>
<li><a href="" Builds</a> are summarized here, one per line.</li>
@@ -40,7 +40,7 @@
<li><a href="" dashboard</a> (External site)</li>
<li><a href="" Viewer</a></li>
<li><a href="" Failures</a></li>
- <li><a href="" Perf Monitor</a> results submitted by <a href="" bots</a></li>
+ <li><a href="" Perf Monitor</a> results submitted by <a href="" bots</a></li>
</ul>
<h2>Status</h2>
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py (212395 => 212396)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py 2017-02-15 22:42:16 UTC (rev 212396)
@@ -46,7 +46,6 @@
("ManualTests", []),
("Tools/BuildSlaveSupport/build.webkit.org-config/public_html", []),
("Websites", []),
- ("efl", []),
("opengl", []),
("opentype", []),
("openvg", []),
Modified: trunk/Tools/ChangeLog (212395 => 212396)
--- trunk/Tools/ChangeLog 2017-02-15 22:36:56 UTC (rev 212395)
+++ trunk/Tools/ChangeLog 2017-02-15 22:42:16 UTC (rev 212396)
@@ -1,3 +1,36 @@
+2017-02-15 Lucas Forschler <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=168386
+ Remove EFL from build.webkit.org
+
+ Reviewed by Alex Christensen
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (DeleteStaleBuildFiles.start):
+ (appendCustomBuildFlags):
+ (RunWebKitTests.start):
+ (RunBuiltinsTests):
+ (Factory.__init__):
+ (TestFactory.__init__):
+ (loadBuilderConfig):
+ (InstallEflDependencies): Deleted.
+ (RunEflAPITests): Deleted.
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js:
+ (BubbleQueueServer):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/MetricsAnalyzer.js:
+ (Analyzer.prototype._triggeringQueue):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+ (WebKitBuildbot):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
+ (table.queue-grid tr.platform.linux-efl img.logo): Deleted.
+ * BuildSlaveSupport/build.webkit.org-config/templates/root.html:
+ * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
+ (_should_file_trigger_build):
+
2017-02-15 Alex Christensen <[email protected]>
Unreviewed, rolling out r212169.
