Diff
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js (293015 => 293016)
--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js 2022-04-19 12:32:02 UTC (rev 293015)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js 2022-04-19 15:45:08 UTC (rev 293016)
@@ -43,12 +43,9 @@
this._authenticationStatus = Buildbot.AuthenticationStatus.Unauthenticated;
this.baseURLForResults = options ? options.baseURLForResults : null;
- this.VERSION_LESS_THAN_09 = options && options.USE_BUILDBOT_VERSION_LESS_THAN_09;
- if (!this.VERSION_LESS_THAN_09) {
- this._builderNameToIDMap = {};
- this._computeBuilderNameToIDMap();
- }
+ this._builderNameToIDMap = {};
+ this._computeBuilderNameToIDMap();
for (var id in queuesInfo) {
if (queuesInfo[id].combinedQueues) {
@@ -168,9 +165,6 @@
buildPageURLForIteration: function(iteration)
{
- if (this.VERSION_LESS_THAN_09)
- return this.baseURL + "builders/" + encodeURIComponent(iteration.queue.id) + "/builds/" + iteration.id;
-
// FIXME: Remove this._builderNameToIDMap lookup after <https://github.com/buildbot/buildbot/issues/3465> is fixed.
return this.baseURL + "#/builders/" + encodeURIComponent(this._builderNameToIDMap[iteration.queue.id]) + "/builds/" + iteration.id;
},
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js (293015 => 293016)
--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js 2022-04-19 12:32:02 UTC (rev 293015)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js 2022-04-19 15:45:08 UTC (rev 293016)
@@ -163,17 +163,7 @@
if (!this.failed)
return undefined;
- if (!this.queue.buildbot.VERSION_LESS_THAN_09)
- return this.queue.buildbot.buildPageURLForIteration(this);
-
- console.assert(this._firstFailedStep);
-
- for (var i = 0; i < this._firstFailedStep.logs.length; ++i) {
- if (this._firstFailedStep.logs[i][0] == kind)
- return this._firstFailedStep.logs[i][1];
- }
-
- return undefined;
+ return this.queue.buildbot.buildPageURLForIteration(this);
},
get failureLogs()
@@ -202,7 +192,6 @@
_parseData: function(data)
{
- data = ""
console.assert(!this.id || this.id === data.number);
this.id = data.number;
@@ -246,8 +235,6 @@
// The changes array is generally meaningful for svn triggered queues (such as builders),
// but not for internally triggered ones (such as testers), due to coalescing.
this.changes = [];
- if (this.queue.buildbot.VERSION_LESS_THAN_09)
- console.assert(data.sourceStamp || data.sourceStamps)
if (data.sourceStamp)
this.changes = sourceStampChanges(data.sourceStamp);
else if (data.sourceStamps)
@@ -316,61 +303,11 @@
_stdioURLForStep: function(step)
{
- if (this.queue.buildbot.VERSION_LESS_THAN_09) {
- try {
- return step.logs[0][1];
- } catch (ex) {
- return;
- }
- }
-
// FIXME: Update this logic after <https://github.com/buildbot/buildbot/issues/3465> is fixed. Buildbot 0.9 does
// not provide a URL to stdio for a build step in the REST API, so we are manually constructing the url here.
return this.queue.buildbot.buildPageURLForIteration(this) + "/steps/" + step.number + "/logs/stdio";
},
- // FIXME: Remove this method after https://bugs.webkit.org/show_bug.cgi?id=175056 is fixed.
- _adjustBuildDataForBuildbot09: function(data)
- {
- if (!this.queue.buildbot.VERSION_LESS_THAN_09)
- return data;
-
- data.started_at = data.times[0];
- data.complete_at = data.times[1];
- delete data["times"];
-
- let revisionProperty = data.properties.findFirst((property) => property[0] === "got_revision");
-
- if (revisionProperty) {
- // Removing first element from revision property to match with new data format.
- // Old format: ["got_revision",{"Internal":"1357","WebKitOpenSource":"2468"},"Source"]
- // New format: [{"Internal":"1357","WebKitOpenSource":"2468"},"Source"]
- console.assert(revisionProperty[0] === "got_revision")
- revisionProperty.splice(0, 1);
- }
- data.properties.got_revision = revisionProperty;
-
- for (var i = 0; i < data.steps.length; i++) {
- data.steps[i].complete = data.steps[i].isFinished;
- delete data.steps[i]["isFinished"];
- // Sample state_string: "Exiting early after 20 crashes and 30 timeouts. 31603 tests run. 147 failures 69 new passes".
- data.steps[i].state_string = data.steps[i].results[1].join(' ');
- data.steps[i].results = data.steps[i].results[0]; // See URL http://docs.buildbot.net/latest/developer/results.html
- }
-
- let masterShellCommandStep = data.steps.findFirst((step) => step.name === "MasterShellCommand");
- if (masterShellCommandStep)
- masterShellCommandStep.urls = [masterShellCommandStep.urls];
-
- data.state_string = data.text.join(" ");
- delete data["text"];
-
- data.complete = !data.currentStep;
- delete data["currentStep"];
-
- return data;
- },
-
_updateIfDataAvailable: function()
{
if (!this._steps || !this._buildData)
@@ -427,10 +364,7 @@
return;
this.isLoading = true;
- if (this.queue.buildbot.VERSION_LESS_THAN_09)
- this.deprecatedUpdate();
- else
- this.actualUpdate();
+ this.actualUpdate();
},
actualUpdate: function()
@@ -463,18 +397,6 @@
}.bind(this), this.urlFailedToLoad, {withCredentials: this.queue.buildbot.needsAuthentication});
},
- deprecatedUpdate: function()
- {
- JSON.load(this.queue.baseURL + "/builds/" + this.id, function(data) {
- this.isLoading = false;
- this.queue.buildbot.isAuthenticated = true;
- if (!data || !data.properties)
- return;
-
- this._deprecatedUpdateWithData(data);
- }.bind(this), this.urlFailedToLoad, {withCredentials: this.queue.buildbot.needsAuthentication});
- },
-
loadLayoutTestResults: function(callback)
{
if (this.queue.buildbot.needsAuthentication && this.queue.buildbot.authenticationStatus === Buildbot.AuthenticationStatus.InvalidCredentials)
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotQueue.js (293015 => 293016)
--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotQueue.js 2022-04-19 12:32:02 UTC (rev 293015)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotQueue.js 2022-04-19 15:45:08 UTC (rev 293016)
@@ -71,17 +71,11 @@
get baseURL()
{
- if (this.buildbot.VERSION_LESS_THAN_09)
- return this.buildbot.baseURL + "json/builders/" + encodeURIComponent(this.id);
-
return this.buildbot.baseURL + "api/v2/builders/" + encodeURIComponent(this.id);
},
get allIterationsURL()
{
- if (this.buildbot.VERSION_LESS_THAN_09)
- return this.baseURL + "/builds/_all/?max=10000";
-
return this.baseURL + "/builds?order=-number";
},
@@ -95,9 +89,6 @@
get overviewURL()
{
- if (this.buildbot.VERSION_LESS_THAN_09)
- return this.buildbot.baseURL + "builders/" + encodeURIComponent(this.id) + "?numbuilds=50";
-
return this.buildbot.baseURL + "#/builders/" + encodeURIComponent(this.id) + "?numbuilds=50";
},
@@ -210,38 +201,21 @@
get buildsInfoURL()
{
- if (this.buildbot.VERSION_LESS_THAN_09)
- return this.baseURL;
-
return this.buildsURL;
},
getBuilds: function(data)
{
- if (this.buildbot.VERSION_LESS_THAN_09)
- return data.cachedBuilds.reverse();
-
return data.builds;
},
isBuildComplete: function(data, index)
{
- if (this.buildbot.VERSION_LESS_THAN_09) {
- var currentBuilds = {};
- if (data.currentBuilds instanceof Array)
- data.currentBuilds.forEach(function(id) { currentBuilds[id] = true; });
-
- return (!(data.cachedBuilds[index] in currentBuilds));
- }
-
return data.builds[index].complete;
},
getIterationID: function(data, index)
{
- if (this.buildbot.VERSION_LESS_THAN_09)
- return data.cachedBuilds[index];
-
return data.builds[index].number;
},
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js (293015 => 293016)
--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js 2022-04-19 12:32:02 UTC (rev 293015)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js 2022-04-19 15:45:08 UTC (rev 293016)
@@ -108,7 +108,7 @@
"PlayStation-Debug-Build": {platform: Dashboard.Platform.PlayStation, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
};
- Buildbot.call(this, "https://build.webkit.org/", queueInfo, {"USE_BUILDBOT_VERSION_LESS_THAN_09" : false});
+ Buildbot.call(this, "https://build.webkit.org/", queueInfo, {});
};
BaseObject.addConstructorFunctions(WebKitBuildbot);
Modified: trunk/Tools/ChangeLog (293015 => 293016)
--- trunk/Tools/ChangeLog 2022-04-19 12:32:02 UTC (rev 293015)
+++ trunk/Tools/ChangeLog 2022-04-19 15:45:08 UTC (rev 293016)
@@ -1,3 +1,15 @@
+2022-04-19 Aakash Jain <[email protected]>
+
+ Delete old buildbot code from bot watchers dashboard
+ https://bugs.webkit.org/show_bug.cgi?id=239497
+
+ Reviewed by Jonathan Bedard.
+
+ * Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/Buildbot.js:
+ * CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotIteration.js:
+ * CISupport/build-webkit-org/public_html/dashboard/Scripts/BuildbotQueue.js:
+ * CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js:
+
2022-04-18 Tyler Wilcock <[email protected]>
AX: Update the isolated tree in response to AXElementBusyChanged and AXTextChanged notifications
