Minor jenkins tests improvements (#181)

* Add timeout to jenkins.waitForBuildToFinish()

* Sync argocd commands execution

* Further increase timeouts for jenkins jobs.

Author: rhopp

src/apis/ci/jenkins.ts

@@ -148,23 +148,27 @@ export class JenkinsCI extends Utils {
     }
 
     // waitForBuildToFinish waits for a build to finish and get its result
-    public async waitForBuildToFinish(jobName: string, buildNumber: number) {
+    public async waitForBuildToFinish(jobName: string, buildNumber: number, timeoutMs: number) {
         const url = `${this.jenkinsUrl}/job/${jobName}/${buildNumber}/api/json`;
 
-        while (true) {
+        const retryInterval = 10 * 1000;
+        let totalTimeMs = 0;
+
+        while (timeoutMs === 0 || totalTimeMs < timeoutMs) {
             try {
                 const response = await this.axiosInstance.post(url);
                 if (response.data.building) {
-                    console.log(`Build #${buildNumber} is still in progress...`);
+                    console.log(`Build #${buildNumber} of job ${jobName} is still in progress...`);
                     await new Promise(resolve => setTimeout(resolve, 15000)); // Wait for 15 seconds
                 } else {
                     console.log(`Build #${buildNumber} finished with status: ${response.data.result}`);
                     return response.data.result;
                 }
             } catch (error) {
                 console.error('Error checking build status:', error);
-                return null;
+                await new Promise(resolve => setTimeout(resolve, 15000)); // Wait for 15 seconds
             }
+            totalTimeMs += retryInterval;
         }
     }
 

src/utils/argocd.ts

@@ -37,17 +37,23 @@ export const syncArgoApplication = async (namespace: string, applicationName: st
     `;
 
     // Execute the shell script commands
-    exec(scriptCommands, (error, stdout: any, stderr: any) => {
-        if (error) {
-            console.error(`Error executing commands: ${error.message}`);
-            return;
-        }
-        if (stderr) {
-            console.error(`Commands STDERR: ${stderr}`);
-            return;
-        }
-
-        console.log(`succesfully synced application ${applicationName} in cluster`);
-        console.log(stdout)
-    });
+    try {
+        await new Promise<void>((done, failed) => {
+            exec(scriptCommands, (error, stdout: any, stderr: any) => {
+                if (error) {
+                    console.error(`Error executing commands: ${error.message}`);
+                    failed(error);
+                }
+                if (stderr) {
+                    console.error(`Commands STDERR: ${stderr}`);
+                }
+        
+                console.log(`succesfully synced application ${applicationName} in cluster`);
+                console.log(stdout);
+                done()
+            });
+        })
+    } catch (error) {
+        fail(error)
+    }
 }

tests/gpts/github/test-config/github_suite_jenkins.ts

@@ -21,7 +21,6 @@ import { syncArgoApplication } from '../../../../src/utils/argocd';
  */
 export const gitHubJenkinsBasicGoldenPathTemplateTests = (gptTemplate: string, stringOnRoute: string) => {
     describe(`Red Hat Trusted Application Pipeline ${gptTemplate} GPT tests GitHub provider with public/private image registry`, () => {
-        jest.retryTimes(2);
 
         const componentRootNamespace = process.env.APPLICATION_ROOT_NAMESPACE || 'rhtap-app';
         const developmentNamespace = `${componentRootNamespace}-development`;
@@ -144,10 +143,10 @@ export const gitHubJenkinsBasicGoldenPathTemplateTests = (gptTemplate: string, s
             await jenkinsClient.buildJenkinsJob(repositoryName);
             console.log('Waiting for the build to start...');
             await new Promise(resolve => setTimeout(resolve, 5000));
-            const jobStatus = await jenkinsClient.waitForBuildToFinish(repositoryName, 1);
+            const jobStatus = await jenkinsClient.waitForBuildToFinish(repositoryName, 1, 540000);
             expect(jobStatus).not.toBe(undefined);
             expect(jobStatus).toBe("SUCCESS");
-        }, 240000);
+        }, 600000);
 
         /**
          * Creates an empty commit
@@ -165,10 +164,10 @@ export const gitHubJenkinsBasicGoldenPathTemplateTests = (gptTemplate: string, s
             await jenkinsClient.buildJenkinsJob(repositoryName);
             console.log('Waiting for the build to start...');
             await new Promise(resolve => setTimeout(resolve, 5000));
-            const jobStatus = await jenkinsClient.waitForBuildToFinish(repositoryName, 2);
+            const jobStatus = await jenkinsClient.waitForBuildToFinish(repositoryName, 2, 540000);
             expect(jobStatus).not.toBe(undefined);
             expect(jobStatus).toBe("SUCCESS");
-        }, 240000);
+        }, 600000);
 
         /**
          * Obtain the openshift Route for the component and verify that the previous builded image was synced in the cluster and deployed in development environment

tests/gpts/gitlab/suites-config/gitlab_suite_jenkins.ts

@@ -23,7 +23,6 @@ import { JenkinsCI } from "../../../../src/apis/ci/jenkins";
  */
 export const gitLabJenkinsBasicTests = (softwareTemplateName: string, stringOnRoute: string) => {
     describe(`Red Hat Trusted Application Pipeline ${softwareTemplateName} GPT tests GitLab provider with public/private image registry`, () => {
-        jest.retryTimes(2);
 
         let backstageClient: DeveloperHubClient;
         let developerHubTask: TaskIdReponse;
@@ -134,8 +133,8 @@ export const gitLabJenkinsBasicTests = (softwareTemplateName: string, stringOnRo
             await jenkinsClient.buildJenkinsJob(repositoryName);
             console.log('Waiting for the build to start...');
             await new Promise(resolve => setTimeout(resolve, 5000));
-            await jenkinsClient.waitForBuildToFinish(repositoryName, 1);
-        }, 240000);
+            await jenkinsClient.waitForBuildToFinish(repositoryName, 1, 540000);
+        }, 600000);
 
 
         /**
@@ -152,8 +151,8 @@ export const gitLabJenkinsBasicTests = (softwareTemplateName: string, stringOnRo
             await jenkinsClient.buildJenkinsJob(repositoryName);
             console.log('Waiting for the build to start...');
             await new Promise(resolve => setTimeout(resolve, 5000));
-            await jenkinsClient.waitForBuildToFinish(repositoryName, 2);
-        }, 240000);
+            await jenkinsClient.waitForBuildToFinish(repositoryName, 2, 540000);
+        }, 600000);
 
         /**
          * Obtain the openshift Route for the component and verify that the previous builded image was synced in the cluster and deployed in development environment