Update build retry logic

TestResultSummaryService/DataManager.js

@@ -111,7 +111,14 @@ class DataManager {
     }
 
     async updateBuild(data) {
-        logger.verbose('updateBuild', data.buildName, data.buildNum);
+        if (data.buildUrl) {
+            logger.verbose('updateBuild', data.buildUrl);
+        } else if (data.buildName) {
+            logger.verbose('updateBuild', data.buildName, data.buildNum);
+        } else {
+            logger.verbose('updateBuild', data._id);
+        }
+
         const { _id, buildName, ...newData } = data;
         const criteria = { _id: new ObjectID(_id) };
         const testResults = new TestResultsDB();

TestResultSummaryService/JenkinsInfo.js

@@ -8,21 +8,31 @@ const options = { request: { timeout: 30000 } };
 
 // Server connection may drop. If timeout, retry.
 const retry = (fn) => {
-    const promise = Promise.promisify(fn);
     return async function () {
         for (let i = 0; i < 3; i++) {
             try {
-                return await promise.apply(null, arguments);
+                return await new Promise((resolve, reject) => {
+                    fn(...arguments, (err, data) => {
+                        if (err) {
+                            logger.warn(err);
+                            reject(data);
+                        } else {
+                            resolve(data);
+                        }
+                    });
+                });
             } catch (e) {
                 logger.warn(`Try #${i + 1}: connection issue`, arguments);
-                logger.warn(e);
-                logger.warn(`Sleep 2 secs...`);
-                await Promise.delay(2 * 1000);
-                if (
-                    i === 2 &&
-                    e.toString().includes('unexpected status code: 404')
-                ) {
-                    return { code: 404 };
+                if (e) {
+                    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)
+                    // 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']) {
+                        return { code: e.statusCode };
+                    }
                 }
             }
         }

TestResultSummaryService/routes/index.js

@@ -26,6 +26,7 @@ app.get('/getData', wrap(require('./getData')));
 app.get('/getErrorInOutput', wrap(require('./getErrorInOutput')));
 app.get('/getHistoryPerTest', wrap(require('./getHistoryPerTest')));
 app.get('/getJenkins', wrap(require('./getJenkins')));
+app.get('/getJenkinsBuildInfo', wrap(require('./test/getJenkinsBuildInfo')));
 app.get('/getLastBuildInfo', wrap(require('./getLastBuildInfo')));
 app.get('/getLogStream', wrap(require('./getLogStream')));
 app.get('/getOutputById', wrap(require('./getOutputById')));

TestResultSummaryService/routes/test/getJenkinsBuildInfo.js

@@ -0,0 +1,14 @@
+const JenkinsInfo = require('../../JenkinsInfo');
+
+module.exports = async (req, res) => {
+    const { url, buildName, buildNum } = req.query;
+    if (req.query.buildNum)
+        req.query.buildNum = parseInt(req.query.buildNum, 10);
+    const jenkinsInfo = new JenkinsInfo();
+    try {
+        const output = await jenkinsInfo.getBuildInfo(url, buildName, buildNum);
+        res.send({ output });
+    } catch (e) {
+        res.send({ result: e.toString() });
+    }
+};