download report.xml to local filesystem even when DTP publishing is d…

…isabled
parasoft · May 27, 2021 · 1899d36 · 1899d36
1 parent 8c7d862
commit 1899d36
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 132 deletions.
diff --git a/README.md b/README.md
@@ -13,10 +13,20 @@ Add the following entry to your Github workflow YAML file with the required inpu
 ```yaml
 uses: parasoft/execute-job-action@v1
 with:
-  ctpUrl: 'http://exampleUrl'
+  ctpUrl: 'http://ctp.mycompany.org:8080/em/'
   ctpUsername: 'username'
   ctpPassword: ${{ secrets.password }}
   ctpJob: 'Example Job'
+  abortOnTimeout: false
+  timeoutInMinutes: 5
+  publishReport: false
+  dtpUrl: 'http://dtp.mycompany.org:8080/grs/'
+  dtpUsername: 'username'
+  dtpPassword: ${{ secrets.password }}
+  dtpProject: 'My Project'
+  buildId: ${{ github.run_number }}
+  sessionTag: ${{ github.workflow }}
+  appendEnvironment: false
 ```
 ### Required Inputs
 The following inputs are required:

diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -60,7 +60,7 @@ test('test runs', () => {
   process.env['INPUT_CTPUSERNAME'] = 'demo'
   process.env['INPUT_CTPPASSWORD'] = 'demo-user'
   process.env['INPUT_CTPJOB'] = 'P1 Smoke Tests'
-  process.env['INPUT_PUBLISHREPORT'] = 'true'
+  process.env['INPUT_PUBLISHREPORT'] = 'false'
   process.env['INPUT_DTPURL'] = 'http://18.236.243.147:8080/grs/'
   process.env['INPUT_DTPUSERNAME'] = 'demo'
   process.env['INPUT_DTPPASSWORD'] = 'demo-user'

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "execute-job-action",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "private": true,
   "description": "Run a test execution job with Parasoft Continuous Testing Platform (CTP)",
   "main": "lib/main.js",

diff --git a/src/main.ts b/src/main.ts
@@ -27,23 +27,20 @@ export async function run() {
     let dtpService = null;
     const publish = core.getInput('publishReport') === 'true';
     const dtpEndpoint = core.getInput('dtpUrl', { required: false });
-    var dtpAuthorization: service.Authorization = null;
-    if (dtpEndpoint) {
-        dtpAuthorization = { username: core.getInput('dtpUsername'), password: core.getInput('dtpPassword') };
-    }
     const dtpProject = core.getInput('dtpProject');
     const dtpBuildId = core.getInput('buildId');
     let dtpSessionTag = core.getInput('sessionTag');
     const appendEnvironment = core.getInput('appendEnvironment') === 'true';
+    let metaData: report.ReportMetaData = {
+        dtpProject: dtpProject,
+        dtpBuildId: dtpBuildId,
+        dtpSessionTag: dtpSessionTag,
+        appendEnvironment : appendEnvironment
+    }
     if (dtpEndpoint && publish) {
-        let metaData: report.ReportMetaData = {
-            dtpProject: dtpProject,
-            dtpBuildId: dtpBuildId,
-            dtpSessionTag: dtpSessionTag,
-            appendEnvironment : appendEnvironment
-        }
-        dtpService = new report.ReportPublisher(dtpEndpoint, 'grs', ctpService, metaData, dtpAuthorization);
+        dtpService = new service.WebService(dtpEndpoint, 'grs', { username: core.getInput('dtpUsername'), password: core.getInput('dtpPassword') });
     }
+    let reportController = new report.ReportController(ctpService, dtpService, metaData);
     const abortOnTimout = core.getInput('abortOnTimeout') === 'true';
     const timeout = core.getInput('timeoutInMinutes');
     const jobName = core.getInput('ctpJob', { required: true });
@@ -84,45 +81,33 @@ export async function run() {
                 }
                 if (status === 'RUNNING' || status === 'WAITING') {
                     setTimeout(checkStatus, 1000);
-                } else if (status === 'PASSED') {
-                    core.info('All tests passed.');
-                    if (dtpService) {
-                        let environmentNames = extractEnvironmentNames(job);
-                        res.reportIds.forEach((reportId, index) => {
-                            dtpService.publishReport(reportId, index, environmentNames.length > 0 ? environmentNames.shift() : null).catch((err) => {
-                                core.error("Failed to publish report to DTP");
-                            }).then(() => {
-                                if (index === 0) {
-                                    console.log('   View results in DTP: ' + dtpService.getBaseURL() + '/dtp/explorers/test?buildId=' + dtpBuildId);
-                                }
-                            });
-                        });
-                    } else {
-			    res.reportIds.forEach((reportId, index) => {
-                                core.info(`   View report in CTP:  ${ctpService.getBaseURL()}/testreport/${reportId}/report.html`);
-			    });
-		    }
                 } else if (status === 'CANCELED') {
                     core.warning('Test execution was canceled.');
                 } else {
-                    core.error('Some tests failed.');
-                    if (dtpService) {
-                        res.reportIds.forEach((reportId, index) => {
-                            let environmentNames = extractEnvironmentNames(job);
-                            dtpService.publishReport(reportId, index, environmentNames.length > 0 ? environmentNames.shift() : null).catch((err) => {
-                                core.error("Failed to publish report to DTP");
-                            }).then(() => {
-                                if (index === 0) {
-                                    console.log('   View results in DTP: ' + dtpService.getBaseURL() + '/dtp/explorers/test?buildId=' + dtpBuildId);
-                                }
-                            });
-                        });
+                    if (status === 'PASSED') {
+                        core.info('All tests passed.');
                     } else {
-			    res.reportIds.forEach((reportId, index) => {
-                                core.info(`   View report in CTP:  ${ctpService.getBaseURL()}/testreport/${reportId}/report.html`);
-			    });
+                        core.setFailed('Some tests failed.');
                     }
-                    core.setFailed('Job "' + jobName + '" failed.');
+                    let environmentNames = extractEnvironmentNames(job);
+                    res.reportIds.forEach((reportId, index) => {
+                        let downloadPromise = reportController.downloadReport(reportId, index, environmentNames.length > 0 ? environmentNames.shift() : null).catch((err) => {
+                                core.error("Failed to download report from CTP");
+			    });
+                        if (dtpService) {
+                            downloadPromise.then(() => {
+		                reportController.uploadFile(reportId).then(response => {
+                                    core.debug(`   report.xml file upload successful: ${response}`);
+                                    if (index === 0) {
+                                        core.info('   View results in DTP: ' + dtpService.getBaseURL() + '/dtp/explorers/test?buildId=' + dtpBuildId);
+				    }
+                                }).catch((error) => {
+                                    core.error(`Error while uploading report.xml file: ${error}`);
+                                    core.error("Failed to publish report to DTP");
+                                });
+                            });
+                        }
+		    });
                 }
             });
         };