Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
11 changes: 7 additions & 4 deletions TestResultSummaryService/BuildProcessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@ class BuildProcessor {
);

if (buildInfo) {
if (buildInfo.code === 404) {
if (buildInfo.code === 404 || buildInfo.code === 403) {
/*
* Return code is 404. The url is invalid or the build does not
* exist on Jenkins any more, just set status to Done and store
* the build info
* The url is invalid or the build does not exist on Jenkins any more
* (return code is 404 or 403), just set status to Done and store the
* build info.
*/
logger.warn(
`buildInfo.code: ${buildInfo.code}. Set build ${url} status to Done.`
);
task.status = 'Done';
await new DataManager().updateBuild(task);
await new AuditLogsDB().insertAuditLogs({
Expand Down
9 changes: 6 additions & 3 deletions TestResultSummaryService/JenkinsInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ const retry = (fn) => {
logger.warn(`status code: ${e.statusCode}`);
logger.warn(`headers: ${JSON.stringify(e.headers)}`);

// return code 404 only if the Jenkins server returns 404 for the build (i.e., invalid url, expired build, etc)
// return code 404 or 403 from the Jenkins server (i.e., invalid url, expired build, etc)
// x-jenkins header is checked to ensure the error code is from Jenkins (not nginx)
// TRSS will stop processing this build once code 404 is returned. See BuildProcessor for details.
if (e.statusCode === 404 && e.headers['x-jenkins']) {
// TRSS will stop processing this build once code 404 or 403 is returned. See BuildProcessor for details.
if (
(e.statusCode === 404 || e.statusCode === 403) &&
e.headers['x-jenkins']
) {
return { code: e.statusCode };
}
}
Expand Down
Loading