Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Miscellaneous cleanup
  • Loading branch information
codebytere committed Jul 5, 2020
commit 58a3691c82d7151196fd207f5b08ec1cc332bbc2
2 changes: 1 addition & 1 deletion bin/ncu-ci
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
49 changes: 24 additions & 25 deletions lib/ci/ci_result_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}]`;
Expand Down Expand Up @@ -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)
Expand All @@ -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;
}

Expand All @@ -830,16 +839,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();
}
}

function filterBuild(builds, type) {
Expand Down