Merge pull request #258 from katalon-studio/fix-agent

Fix agent
katalon-studio · Sep 9, 2024 · 992cb2c · 992cb2c
2 parents 90a5b37 + aa714a1
commit 992cb2c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/package_agent.yml b/.github/workflows/package_agent.yml
@@ -4,6 +4,7 @@ name: Package Agent
     branches:
       - master
       - release
+      - fix-agent
 
 permissions:
   id-token: write # This is required for requesting the JWT

diff --git a/src/service/agent.js b/src/service/agent.js
@@ -400,21 +400,28 @@ class Agent {
       const jobBody = fs.readJsonSync('job.json', { encoding: 'utf-8' });
       const { id: jobId } = jobBody;
       let parameter = jobBody.parameter;
-      let projectId = jobBody.testProject?.projectId;
+      let projectId = jobBody.testProject ? jobBody.testProject.projectId : undefined;
 
       if (!parameter || !projectId) {
         const requestJobResponse = await api.getJob(jobId);
-        if (!(requestJobResponse?.body?.parameter && requestJobResponse?.body?.testProject)) {
+        if (!(requestJobResponse && requestJobResponse.body && requestJobResponse.body.parameter && requestJobResponse.body.testProject)) {
           // There is no job to execute
           return;
         }
+
+        logger.info(`QQQQQQ0: ${parameter}`);
+        logger.info(`QQQQQQ1: ${requestJobResponse.body.parameter}`);
         if (parameter) {
           parameter = { ...requestJobResponse.body.parameter, ...parameter } 
+          logger.info(`QQQQQQ2: ${parameter}`);
         } else {
           parameter = requestJobResponse.body.parameter
+          logger.info(`QQQQQQ3: ${parameter}`);
         }
         projectId = requestJobResponse.body.testProject.projectId;
+        logger.info(`QQQQQQ4: ${projectId}`);
       }
+      logger.info(`QQQQQQ5: ${parameter}`);
 
       const jobApiKey = parameter.environmentVariables
         .find((item) => item.name === jobApiKeyEnv);