Fix filter error and simplify logic

nodejs · Jul 21, 2020 · 0dbe375 · 0dbe375
1 parent 1fc9c06
commit 0dbe375
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 58 deletions.
diff --git a/diff.json b/diff.json
@@ -0,0 +1,38 @@
+[
+  {
+    "baseBuild": {
+      "source": "https://api.github.com/repos/nodejs/node/git/refs/heads/v10.x",
+      "upstream": "https://ci.nodejs.org/job/citgm-smoker/2417/"
+    },
+    "comparisonBuild": {
+      "source": "https://api.github.com/repos/nodejs/node/git/refs/heads/v10.22.0-proposal",
+      "upstream": "https://ci.nodejs.org/job/citgm-smoker/2421/"
+    },
+    "aix71-ppc64": [
+      "ember-cli-v3.19.0"
+    ],
+    "ubuntu1804-64": [],
+    "fedora-last-latest-x64": [
+      "spawn-wrap-v2.0.0",
+      "winston-v3.3.3"
+    ],
+    "osx1014": [
+      "fastify-v3.0.3"
+    ],
+    "ubuntu1404-64": [],
+    "rhel7-s390x": [
+      "uglify-js-v3.10.0"
+    ],
+    "osx1015": [],
+    "centos7-ppcle": [
+      "ember-cli-v3.19.0",
+      "multer-v1.4.2"
+    ],
+    "ubuntu1604-64": [
+      "clinic-v6.0.2",
+      "yargs-v15.4.1"
+    ],
+    "debian9-64": [],
+    "fedora-latest-x64": []
+  }
+]
diff --git a/lib/ci/build-types/citgm_build.js b/lib/ci/build-types/citgm_build.js
@@ -68,6 +68,7 @@ class CITGMBuild extends TestBuild {
   parseResults(data) {
     const { childReports, totalCount, skipCount, failCount } = data;
     const results = { all: {}, failures: {}, statistics: {} };
+    const failureStatuses = ['FAILED', 'REGRESSION'];
 
     const passCount = totalCount - failCount - skipCount;
     results.statistics.passed = passCount;
@@ -82,7 +83,10 @@ class CITGMBuild extends TestBuild {
 
       results.all[nodeName] = { url, modules: cases };
 
-      const failedModules = cases.filter(c => c.status === 'FAILED');
+      const failedModules = cases.filter(c => {
+        return failureStatuses.includes(c.status);
+      });
+
       results.failures[nodeName] = { url, modules: failedModules };
     });
 

diff --git a/lib/ci/build-types/citgm_comparison_build.js b/lib/ci/build-types/citgm_comparison_build.js
@@ -31,14 +31,25 @@ class CITGMComparisonBuild {
     const { failures: comparisonFailures } = comparisonBuild.results;
 
     const failures = {};
-    for (const platform in baseFailures) {
-      const { modules: baseModules } = baseFailures[platform];
-      const { modules: comparisonModules } = comparisonFailures[platform];
+    for (const platform in comparisonFailures) {
+      // Account for no failure on this platform, or different platform.
+      if (!Object.prototype.hasOwnProperty.call(baseFailures, platform)) {
+        failures[platform] = [];
+        continue;
+      }
 
-      const newFailures = comparisonModules.filter(f => {
-        return !baseModules.includes(f.name);
+      const baseModules = baseFailures[platform].modules.map(f => {
+        return f.name;
+      });
+      const comparisonModules = comparisonFailures[platform].modules.map(f => {
+        return f.name;
       });
 
+      // Filter for every failed module in the comparison job module set
+      // that is not present in the failure set for the base job module set.
+      const newFailures = comparisonModules.filter(f => {
+        return !baseModules.includes(f);
+      });
       if (newFailures.length !== 0) {
         result = statusType.FAILURE;
       }
@@ -65,26 +76,30 @@ class CITGMComparisonBuild {
   displayBuilds() {
     const { builds, cli, results, result } = this;
 
-    const baseID = builds.baseBuild.id;
-    const comparisonID = builds.comparisonBuild.id;
+    const bID = builds.baseBuild.id;
+    const cID = builds.comparisonBuild.id;
 
     cli.separator('Results');
 
     if (result === statusType.SUCCESS) {
       cli.log('\n\n');
-      const str = `No new failures in ${baseID} compared to ${comparisonID}`;
+      const str = `No new failures in ${cID} compared to ${bID}`;
       cli.log(`${statusType.SUCCESS}: ${str}\n\n`);
       return;
     }
 
     const output = {};
+    let totalFailures = 0;
     for (const platform in results.failures) {
-      const modules = results.failures[platform];
-      const failures = modules.map(f => f.name);
+      const failures = results.failures[platform];
+      totalFailures += failures.length;
 
       output[platform] = failures;
     }
 
+    cli.log('\n\n');
+    const str = `${totalFailures} failures in ${cID} not present in ${bID}`;
+    cli.log(`${statusType.FAILURE}: ${str}\n\n`);
     console.table(output);
   }
 
@@ -128,7 +143,7 @@ class CITGMComparisonBuild {
       const data = results.failures[failure];
       output += `### ${failure}\n\n`;
 
-      const failures = data.map(f => `* ${f.name}`);
+      const failures = data.map(f => `* ${f}`);
       output += failures.length ? `${failures.join('\n')}\n\n` : 'None.\n\n';
     }
     return output;

diff --git a/test/fixtures/jenkins/citgm-compare/expected.json b/test/fixtures/jenkins/citgm-compare/expected.json
@@ -7,43 +7,22 @@
     "source": "https://github.com/nodejs/node/pull/33811/",
     "upstream": "https://ci.nodejs.org/job/citgm-smoker/2392/"
   },
-  "debian9-64": [
-    {
-      "name": "express-session-v1.17.1",
-      "status": "FAILED"
-    },
-    {
-      "name": "yeoman-generator-v4.10.1",
-      "status": "FAILED"
-    }
-  ],
   "centos7-ppcle": [
-    {
-      "name": "ember-cli-v3.18.0",
-      "status": "FAILED"
-    },
-    {
-      "name": "multer-v1.4.2",
-      "status": "FAILED"
-    },
-    {
-      "name": "torrent-stream-v1.2.0",
-      "status": "FAILED"
-    }
-  ],
-  "rhel7-s390x": [
-    {
-      "name": "torrent-stream-v1.2.0",
-      "status": "FAILED"
-    }
+    "multer-v1.4.2"
   ],
   "fedora-latest-x64": [
-    {
-      "name": "spawn-wrap-v2.0.0",
-      "status": "FAILED"
-    }
+    "spawn-wrap-v2.0.0"
   ],
-  "ubuntu1804-64": [],
   "fedora-last-latest-x64": [],
-  "ubuntu1604-64": []
-}
+  "debian9-64": [
+    "express-session-v1.17.1",
+    "yeoman-generator-v4.10.1"
+  ],
+  "osx1014": [],
+  "rhel7-s390x": [
+    "torrent-stream-v1.2.0"
+  ],
+  "aix71-ppc64": [],
+  "ubuntu1604-64": [],
+  "ubuntu1804-64": []
+}
diff --git a/test/fixtures/jenkins/citgm-compare/expected.md b/test/fixtures/jenkins/citgm-compare/expected.md
@@ -2,34 +2,40 @@
 
 ## New Failures in job [#2390](https://ci.nodejs.org/job/citgm-smoker/2390/)
 
+### centos7-ppcle
+
+* multer-v1.4.2
+
+### fedora-latest-x64
+
+* spawn-wrap-v2.0.0
+
+### fedora-last-latest-x64
+
+None.
+
 ### debian9-64
 
 * express-session-v1.17.1
 * yeoman-generator-v4.10.1
 
-### centos7-ppcle
+### osx1014
 
-* ember-cli-v3.18.0
-* multer-v1.4.2
-* torrent-stream-v1.2.0
+None.
 
 ### rhel7-s390x
 
 * torrent-stream-v1.2.0
 
-### fedora-latest-x64
-
-* spawn-wrap-v2.0.0
-
-### ubuntu1804-64
+### aix71-ppc64
 
 None.
 
-### fedora-last-latest-x64
+### ubuntu1604-64
 
 None.
 
-### ubuntu1604-64
+### ubuntu1804-64
 
 None.