Miscellaneous cleanup

Author: codebytere

bin/ncu-ci

@@ -260,7 +260,7 @@ class CICommand {
       if (this.json.length) {
         writeJson(argv.json, this.json);
         cli.separator('');
-        cli.log(`Written JSON to ${argv.json}`);
+        cli.log(`Wrote JSON to ${argv.json}`);
       } else {
         cli.error('No JSON generated');
       }

lib/ci/ci_result_parser.js

@@ -64,7 +64,6 @@ const CAUSE_TREE = 'upstreamBuild,upstreamProject,shortDescription,_class';
 const RUN_TREE = `actions[causes[${CAUSE_TREE}]],builtOn`;
 
 // hudson.tasks.test.MatrixTestResult
-
 const RESULT_TREE = 'result[suites[cases[name,status]]]';
 const CITGM_REPORT_TREE =
   `failCount,skipCount,totalCount,childReports[child[url],${RESULT_TREE}]`;
@@ -761,9 +760,11 @@ class CITGMBuild extends TestBuild {
   }
 
   async getResults() {
+    const { id } = this;
+
     let headerData;
     try {
-      headerData = await this.getBuildData('Header');
+      headerData = await this.getBuildData('Summary');
     } catch (err) {
       this.failures = [
         new NCUFailure({ url: this.apiUrl }, err.message)
@@ -777,43 +778,51 @@ class CITGMBuild extends TestBuild {
     // CITGM jobs store results in a different location than
     // they do summary data, so we need to update the endpoint
     // and issue a second API call in order to fetch result data.
-    this.updateAPIVariables();
+    this.tree = CITGM_REPORT_TREE;
+    this.path = `job/citgm-smoker/${this.id}/testReport/`;
 
     let resultData;
     try {
-      resultData = await this.getBuildData('Report');
+      resultData = await this.getBuildData('Results');
     } catch (err) {
       this.failures = [
         new NCUFailure({ url: this.apiUrl }, err.message)
       ];
       return this.failures;
     }
 
-    const { childReports } = resultData;
+    this.results = this.parseResults(resultData.childReports);
 
-    this.results = this.parseResults(childReports);
+    // Update id again so that it correctly displays in Summary output.
+    this.path = `job/citgm-smoker/${id}/`;
 
     return { result };
   }
 
+  formatAsJson() {
+    const { results } = this;
+
+    const result = results.all.map(item => Object.assign({
+      source: this.sourceURL,
+      upstream: this.jobUrl
+    }, item));
+
+    return JSON.parse(JSON.stringify(result));
+  }
+
   parseResults(data) {
-    const results = { passes: [], failures: [], skips: [], fixes: [] };
+    const results = { all: [], failures: [] };
+
     data.forEach(platform => {
       const cases = flatten(platform.result.suites[0].cases);
       const nodeName = getNodeName(platform.child.url);
 
-      const passedModules = cases.filter(c => c.status === 'PASSED');
-      results.passes.push({ [nodeName]: passedModules });
+      results.all.push({ [nodeName]: cases });
 
       const failedModules = cases.filter(c => c.status === 'FAILED');
       results.failures.push({ [nodeName]: failedModules });
-
-      const skippedModules = cases.filter(c => c.status === 'SKIPPED');
-      results.skips.push({ [nodeName]: skippedModules });
-
-      const fixedModules = cases.filter(c => c.status === 'FIXED');
-      results.fixes.push({ [nodeName]: fixedModules });
     });
+
     return results;
   }
 
@@ -831,11 +840,6 @@ class CITGMBuild extends TestBuild {
     console.table(output);
   }
 
-  updateAPIVariables() {
-    this.tree = CITGM_REPORT_TREE;
-    this.path = `job/citgm-smoker/${this.id}/testReport/`;
-  }
-
   display() {
     this.displayHeader();
     this.displayBuilds();