Changeset 176361 in webkit

Timestamp:

Nov 19, 2014 3:58:03 PM (9 years ago)

Author:

dburkart@apple.com

Message:

Work around the fact that different masters may have different names for their codebases.
​https://bugs.webkit.org/show_bug.cgi?id=138878

Reviewed by Mark Rowe.

• BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:

(parseRevisionProperty): Changed.
Take a "fallback key" in addition to the primary key, so we can deal with inconsistencies in
opensource / internal codebase naming convention.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js

@@ -97 +97 @@
 }
 
-function parseRevisionProperty(property, key)
+function parseRevisionProperty(property, key, fallbackKey)
 {
     if (!property)
         return null;
     var value = property[1];
-    return parseInt(isMultiCodebaseGotRevisionProperty(property) ? value[key] : value, 10);
+    if (isMultiCodebaseGotRevisionProperty(property))
+        value = (key in value) ? value[key] : value[fallbackKey];
+    return parseInt(value);
 }
 
@@ -243 +245 @@
         // ["got_revision",{"Internal":"1357","WebKitOpenSource":"2468"},"Source"]
         // OR
-        // ["got_revision","2468_1357","Source"]
-        // OR
         // ["got_revision","2468","Source"]
         //
@@ -253 +253 @@
         // a dictionary.
 
-        var openSourceRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "got_revision" || property[0] === "revision" || property[0] === "opensource_got_revision"; });
-        this.openSourceRevision = parseRevisionProperty(openSourceRevisionProperty, "WebKit");
-
-        var internalRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "internal_got_revision" || isMultiCodebaseGotRevisionProperty(property); });
-        this.internalRevision = parseRevisionProperty(internalRevisionProperty, "Internal");
+        var openSourceRevisionProperty = data.properties.findFirst(function(property) { return property[0] === "got_revision"; });
+        this.openSourceRevision = parseRevisionProperty(openSourceRevisionProperty, "WebKit", "opensource");
+
+        var internalRevisionProperty = data.properties.findFirst(function(property) { return isMultiCodebaseGotRevisionProperty(property); });
+        this.internalRevision = parseRevisionProperty(internalRevisionProperty, "Internal", "internal");
 
         function sourceStampChanges(sourceStamp) {

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-19  Dana Burkart  <dburkart@apple.com>
+
+        Work around the fact that different masters may have different names for their codebases.
+        https://bugs.webkit.org/show_bug.cgi?id=138878
+
+        Reviewed by Mark Rowe.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+        (parseRevisionProperty): Changed.
+        Take a "fallback key" in addition to the primary key, so we can deal with inconsistencies in
+        opensource / internal codebase naming convention.
+
 2014-11-19  Chris Fleizach  <cfleizach@apple.com>