Title: [162846] trunk/Tools
- Revision
- 162846
- Author
- [email protected]
- Date
- 2014-01-27 11:06:40 -0800 (Mon, 27 Jan 2014)
Log Message
Teach Buildbot dashboard to parse alternative revision format
https://bugs.webkit.org/show_bug.cgi?id=127561
Reviewed by Alexey Proskuryakov.
Add support for extracting the OpenSource and Internal revision numbers when Buildbot
returns a dictionary for the value of property got_revision.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(parseRevisionProperty): Added; parses Buildbot revision property, which can either be a
string or a dictionary.
(BuildbotIteration.prototype.update.): Modified to call parseRevisionProperty() to determine
the OpenSource and Internal revision numbers.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (162845 => 162846)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-27 18:53:26 UTC (rev 162845)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-01-27 19:06:40 UTC (rev 162846)
@@ -62,6 +62,17 @@
Updated: "updated"
};
+function parseRevisionProperty(property, key)
+{
+ if (!property)
+ return null;
+
+ // The property "got_revision" is a dictionary for multi-codebase builds
+ // according to <http://docs.buildbot.net/0.8.8/manual/cfg-properties.html>.
+ var value = property[1];
+ return parseInt(typeof value == "string" ? value : value[key], 10);
+}
+
BuildbotIteration.prototype = {
constructor: BuildbotIteration,
__proto__: BaseObject.prototype,
@@ -201,10 +212,10 @@
return;
var openSourceRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "got_revision" || property[0] === "revision" || property[0] === "opensource_got_revision"; });
- this.openSourceRevision = openSourceRevisionProperty ? parseInt(openSourceRevisionProperty[1], 10) : null;
+ this.openSourceRevision = parseRevisionProperty(openSourceRevisionProperty, "WebKitOpenSource");
- var internalRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "internal_got_revision"; });
- this.internalRevision = internalRevisionProperty ? parseInt(internalRevisionProperty[1], 10) : null;
+ var internalRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "internal_got_revision" || property[0] === "got_revision"; });
+ this.internalRevision = parseRevisionProperty(internalRevisionProperty, "Internal");
var layoutTestResults = collectTestResults.call(this, data, "layout-test");
this.layoutTestResults = layoutTestResults ? new BuildbotTestResults(this, layoutTestResults) : null;
Modified: trunk/Tools/ChangeLog (162845 => 162846)
--- trunk/Tools/ChangeLog 2014-01-27 18:53:26 UTC (rev 162845)
+++ trunk/Tools/ChangeLog 2014-01-27 19:06:40 UTC (rev 162846)
@@ -1,3 +1,19 @@
+2014-01-27 Daniel Bates <[email protected]>
+
+ Teach Buildbot dashboard to parse alternative revision format
+ https://bugs.webkit.org/show_bug.cgi?id=127561
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add support for extracting the OpenSource and Internal revision numbers when Buildbot
+ returns a dictionary for the value of property got_revision.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+ (parseRevisionProperty): Added; parses Buildbot revision property, which can either be a
+ string or a dictionary.
+ (BuildbotIteration.prototype.update.): Modified to call parseRevisionProperty() to determine
+ the OpenSource and Internal revision numbers.
+
2014-01-27 Carlos Garcia Campos <[email protected]>
[GTK] Implement custom URI schemes with CustomProtocols
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
