Title: [217481] trunk/Websites/perf.webkit.org
Revision
217481
Author
[email protected]
Date
2017-05-26 01:16:00 -0700 (Fri, 26 May 2017)

Log Message

Show patches applied in each A/B testing build requests
https://bugs.webkit.org/show_bug.cgi?id=172636

Reviewed by Antti Koivisto.

List patches applied along side revisions inn the list of revisions for an A/B tesing build requests if there
are any patches applied.

* public/v3/components/test-group-revision-table.js:
(TestGroupRevisionTable.prototype._renderTable): Indicate which request is to build a patch and which one is
to run tests.
(TestGroupRevisionTable.prototype._buildCommitCell): Include the patch file's information when there is one.
We need to use the requested commit set instead of the one reported by testers or builders since they don't
include patch or root information.
(TestGroupRevisionTable.prototype._buildCustomRootsCell):
(TestGroupRevisionTable.prototype._buildFileInfo): Extracted from _buildCustomRootsCell.

Modified Paths

Diff

Modified: trunk/Websites/perf.webkit.org/ChangeLog (217480 => 217481)


--- trunk/Websites/perf.webkit.org/ChangeLog	2017-05-26 08:15:35 UTC (rev 217480)
+++ trunk/Websites/perf.webkit.org/ChangeLog	2017-05-26 08:16:00 UTC (rev 217481)
@@ -1,5 +1,24 @@
 2017-05-26  Ryosuke Niwa  <[email protected]>
 
+        Show patches applied in each A/B testing build requests
+        https://bugs.webkit.org/show_bug.cgi?id=172636
+
+        Reviewed by Antti Koivisto.
+
+        List patches applied along side revisions inn the list of revisions for an A/B tesing build requests if there
+        are any patches applied.
+
+        * public/v3/components/test-group-revision-table.js:
+        (TestGroupRevisionTable.prototype._renderTable): Indicate which request is to build a patch and which one is
+        to run tests.
+        (TestGroupRevisionTable.prototype._buildCommitCell): Include the patch file's information when there is one.
+        We need to use the requested commit set instead of the one reported by testers or builders since they don't
+        include patch or root information.
+        (TestGroupRevisionTable.prototype._buildCustomRootsCell):
+        (TestGroupRevisionTable.prototype._buildFileInfo): Extracted from _buildCustomRootsCell.
+
+2017-05-26  Ryosuke Niwa  <[email protected]>
+
         The queue page is broke when there is a custom analysis task
         https://bugs.webkit.org/show_bug.cgi?id=172631
 

Modified: trunk/Websites/perf.webkit.org/public/v3/components/test-group-revision-table.js (217480 => 217481)


--- trunk/Websites/perf.webkit.org/public/v3/components/test-group-revision-table.js	2017-05-26 08:15:35 UTC (rev 217480)
+++ trunk/Websites/perf.webkit.org/public/v3/components/test-group-revision-table.js	2017-05-26 08:16:00 UTC (rev 217481)
@@ -34,18 +34,23 @@
 
         const requestedRepositorySet = new Set;
         const additionalRepositorySet = new Set;
-        let hasCustomRoots = false;
         for (const commitSet of commitSets) {
-            if (commitSet.customRoots().length)
-                hasCustomRoots = true;
             for (const repository of commitSet.repositories())
                 requestedRepositorySet.add(repository);
         }
 
         const rowEntries = [];
+        let hasCustomRoots = false;
+        let firstRequest = null;
         commitSets.forEach((commitSet, commitSetIndex) => {
             const setLabel = testGroup.labelForCommitSet(commitSet);
             const buildRequests = testGroup.requestsForCommitSet(commitSet);
+
+            if (commitSet.customRoots().length)
+                hasCustomRoots = true;
+            if (!firstRequest)
+                firstRequest = buildRequests[0];
+
             buildRequests.forEach((request, i) => {
                 const resultCommitSet = analysisResults ? analysisResults.commitSetForRequest(request) : null;
                 if (resultCommitSet) {
@@ -54,11 +59,17 @@
                             additionalRepositorySet.add(repository);
                     }
                 }
+                let label = (1 + request.order()).toString();
+                if (request.order() < 0)
+                    label = `Build ${request.order() - firstRequest.order() + 1}`;
+                else if (firstRequest.isBuild())
+                    label = `Test ${label}`;
                 rowEntries.push({
                     groupHeader: !i ? setLabel : null,
                     groupRowCount: buildRequests.length,
-                    label: (1 + +request.order()).toString(),
+                    label,
                     commitSet: resultCommitSet || commitSet,
+                    requestedCommitSet: commitSet,
                     customRoots: commitSet.customRoots(), // FIXME: resultCommitSet should also report roots that got installed.
                     rowCountByRepository: new Map,
                     repositoriesToSkip: new Set,
@@ -90,7 +101,7 @@
                     entry.groupHeader ? element('td', {rowspan: entry.groupRowCount}, entry.groupHeader) : [],
                     requestedRepositoryList.map((repository) => this._buildCommitCell(entry, repository)),
                     hasCustomRoots ? this._buildCustomRootsCell(entry) : [],
-                    element('td', 1 + +request.order()),
+                    element('td', entry.label),
                     element('td', request.statusUrl() ? link(request.statusLabel(), request.statusUrl()) : request.statusLabel()),
                     additionalRepositoryList.map((repository) => this._buildCommitCell(entry, repository)),
                 ]);
@@ -104,6 +115,7 @@
 
         if (entry.repositoriesToSkip.has(repository))
             return [];
+
         const commit = entry.commitSet.commitForRepository(repository);
         let content = '';
         if (commit) {
@@ -111,6 +123,11 @@
             if (commit.url())
                 content = link(content, commit.url());
         }
+
+        const patch = entry.requestedCommitSet.patchForRepository(repository);
+        if (patch)
+            content = [content, ' with ', this._buildFileInfo(patch)];
+
         return element('td', {rowspan: entry.rowCountByRepository.get(repository)}, content);
     }
 
@@ -119,20 +136,27 @@
         const rowspan = entry.customRootsRowCount;
         if (!rowspan)
             return [];
+
         const element = ComponentBase.createElement;
-        const link = ComponentBase.createLink;
-
         if (!entry.customRoots.length)
             return element('td', {class: 'roots', rowspan});
 
         return element('td', {class: 'roots', rowspan},
             element('ul', entry.customRoots.map((customRoot) => {
-                if (customRoot.deletedAt())
-                    return [customRoot.label(), ' ', element('span', {class: 'purged'}, '(Purged)')];
-                return link(customRoot.label(), customRoot.filename(), customRoot.url());
+                return this._buildFileInfo(customRoot);
             }).map((content) => element('li', content))));
     }
 
+    _buildFileInfo(file)
+    {
+        const element = ComponentBase.createElement;
+        const link = ComponentBase.createLink;
+
+        if (file.deletedAt())
+            return [file.label(), ' ', element('span', {class: 'purged'}, '(Purged)')];
+        return link(file.label(), file.url());
+    }
+
     _mergeCellsWithSameCommitsAcrossRows(rowEntries)
     {
         for (let rowIndex = 0; rowIndex < rowEntries.length; rowIndex++) {
@@ -141,11 +165,13 @@
                 if (entry.repositoriesToSkip.has(repository))
                     continue;
                 const commit = entry.commitSet.commitForRepository(repository);
+                const patch = entry.commitSet.patchForRepository(repository);
                 let rowCount = 1;
                 for (let otherRowIndex = rowIndex + 1; otherRowIndex < rowEntries.length; otherRowIndex++) {
                     const otherEntry = rowEntries[otherRowIndex];
                     const otherCommit = otherEntry.commitSet.commitForRepository(repository);
-                    if (commit != otherCommit)
+                    const otherPatch = otherEntry.commitSet.patchForRepository(repository);
+                    if (commit != otherCommit || patch != otherPatch)
                         break;
                     otherEntry.repositoriesToSkip.add(repository);
                     rowCount++;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to