diff --git a/hack/jenkins/test-flake-chart/flake_chart.js b/hack/jenkins/test-flake-chart/flake_chart.js
index ff67b2c3a2..d1265a7c7c 100644
--- a/hack/jenkins/test-flake-chart/flake_chart.js
+++ b/hack/jenkins/test-flake-chart/flake_chart.js
@@ -287,9 +287,11 @@ function displayEnvironmentChart(testData, environmentName) {
// Number of tests to display in chart.
const topFlakes = 10;
+ testData = testData
+ // Filter to only contain unskipped runs of the requested environment.
+ .filter(test => test.environment === environmentName && test.status !== testStatus.SKIPPED);
+
const testRuns = testData
- // Filter to only contain unskipped runs of the requested test and requested environment.
- .filter(test => test.environment === environmentName && test.status !== testStatus.SKIPPED)
.groupBy(test => test.name);
const aggregatedRuns = new Map(testRuns.map(test => [
@@ -348,12 +350,12 @@ function displayEnvironmentChart(testData, environmentName) {
return data !== undefined ? [
data.flakeRate,
`
-
${name}
-
${data.date.toString()}
-
Flake Percentage: ${data.flakeRate.toFixed(2)}%
-
Hashes:
- ${data.commitHashes.map(({ hash, failures, runs }) => ` -
${hash} (Failures: ${failures}/${runs})`).join("
")}
-
+ ${data.date.toString()}
+ Flake Percentage: ${data.flakeRate.toFixed(2)}%
+ Hashes:
+ ${data.commitHashes.map(({ hash, failures, runs }) => ` - ${hash} (Failures: ${failures}/${runs})`).join("
")}
+ `
] : [null, null];
})).flat())
);
@@ -388,12 +390,12 @@ function displayEnvironmentChart(testData, environmentName) {
return data !== undefined ? [
data.duration,
`
-
${name}
-
${data.date.toString()}
-
Average Duration: ${data.duration.toFixed(2)}s
-
Hashes:
- ${data.commitHashes.map(({ hash, duration, runs }) => ` -
${hash} (Average Duration: ${duration.toFixed(2)}s [${runs} runs])`).join("
")}
-
+ ${data.date.toString()}
+ Average Duration: ${data.duration.toFixed(2)}s
+ Hashes:
+ ${data.commitHashes.map(({ hash, duration, runs }) => ` - ${hash} (Average Duration: ${duration.toFixed(2)}s [${runs} runs])`).join("
")}
+ `
] : [null, null];
})).flat())
);
@@ -415,6 +417,87 @@ function displayEnvironmentChart(testData, environmentName) {
const chart = new google.visualization.LineChart(durationContainer);
chart.draw(data, options);
}
+ {
+ // Group test runs by their date, then by their commit, and finally by test names.
+ const testCountData = testData
+ // Group by date.
+ .groupBy(run => run.date.getTime())
+ .map(runDate => ({
+ date: runDate[0].date,
+ commits: runDate
+ // Group by commit
+ .groupBy(run => run.commit)
+ .map(commitRuns => commitRuns
+ // Group by test name.
+ .groupBy(commitRun => commitRun.name)
+ // Consolidate tests of a single name into a single object.
+ .reduce((accum, commitTestRuns) => ({
+ commit: commitTestRuns[0].commit,
+ // The total number of times any test ran.
+ sumTestCount: accum.sumTestCount + commitTestRuns.length,
+ // The total number of times any test failed.
+ sumFailCount: accum.sumFailCount + commitTestRuns.filter(run => run.status === testStatus.FAILED).length,
+ // The most number of times any test name ran (this will be a proxy for the number of integration jobs were triggered).
+ maxRunCount: Math.max(accum.maxRunCount, commitTestRuns.length),
+ }), {
+ sumTestCount: 0,
+ sumFailCount: 0,
+ maxRunCount: 0
+ }))
+ }))
+ .map(dateInfo => ({
+ ...dateInfo,
+ // Use the commit data of each date to compute the average test count and average fail count for the day.
+ testCount: dateInfo.commits.reduce(
+ (accum, commitInfo) => accum + (commitInfo.sumTestCount / commitInfo.maxRunCount), 0) / dateInfo.commits.length,
+ failCount: dateInfo.commits.reduce(
+ (accum, commitInfo) => accum + (commitInfo.sumFailCount / commitInfo.maxRunCount), 0) / dateInfo.commits.length,
+ }))
+ .sort((a, b) => a.date - b.date);
+
+ const data = new google.visualization.DataTable();
+ data.addColumn('date', 'Date');
+ data.addColumn('number', 'Test Count');
+ data.addColumn({ type: 'string', role: 'tooltip', 'p': { 'html': true } });
+ data.addColumn('number', 'Failed Tests');
+ data.addColumn({ type: 'string', role: 'tooltip', 'p': { 'html': true } });
+ data.addRows(
+ testCountData.map(dateInfo => [
+ dateInfo.date,
+ dateInfo.testCount,
+ `
+
${dateInfo.date.toString()}
+
Test Count (averaged): ${+dateInfo.testCount.toFixed(2)}
+
Hashes:
+ ${dateInfo.commits.map(commit => ` -
${commit.commit} (Test count (averaged): ${+(commit.sumTestCount / commit.maxRunCount).toFixed(2)} [${commit.sumTestCount} tests / ${commit.maxRunCount} runs])`).join("
")}
+
+
${dateInfo.date.toString()}
+
Fail Count (averaged): ${+dateInfo.failCount.toFixed(2)}
+
Hashes:
+ ${dateInfo.commits.map(commit => ` -
${commit.commit} (Fail count (averaged): ${+(commit.sumFailCount / commit.maxRunCount).toFixed(2)} [${commit.sumFailCount} fails / ${commit.maxRunCount} runs])`).join("
")}
+