Fix CI/CD integration tests

* Split integ test execution vs report
* Fix test status checks that determines if integration tests failed or
  not
* Remove unused env var from CI/CD

Author: jverce

.circleci/config.yml

@@ -65,7 +65,6 @@ jobs:
 
     environment:
       KEYS_DIR: '/tmp/keys'
-      DX_CLI_URL: 'https://developer.salesforce.com/media/salesforce-cli/sf/channels/stable/sf-linux-x64.tar.xz'
 
     steps:
       - checkout
@@ -118,11 +117,18 @@ jobs:
           no_output_timeout: 270m
           environment:
             SALESFORCE_API_VERSION: '50.0'
-            TEST_REPORTS_DIR_BASE: test_reports
           command: |
             sfdx config:set --global defaultusername=${HUB_SFDC_USER}
             ./deploy_and_test_apex.sh
 
+      - run:
+          name: Generate Test Report
+          working_directory: test/integ
+          environment:
+            TEST_REPORTS_DIR_BASE: test_reports
+          command: |
+            ./generate_test_report.sh
+
       - store_test_results:
           path: test/integ/test_reports
 

test/integ/deploy_and_test_apex.sh

@@ -115,16 +115,3 @@ do
         rm ${WEBHOOK_DATA_FILE}
     done
 done
-
-jq \
-    '. + { testResultsFilename: input_filename } | { status, message, result, stack, testResultsFilename }' \
-    test-results-*.json \
-| jq -s > test-results.json
-
-rm test-results-*.json
-
-TEST_REPORTS_DIR="${TEST_REPORTS_DIR_BASE}/deploy_and_test"
-mkdir -p ${TEST_REPORTS_DIR}
-./format-as-junit.js > ${TEST_REPORTS_DIR}/results.xml
-
-./detect-failed-tests.js

test/integ/detect-failed-tests.js

@@ -2,7 +2,7 @@
 
 const testResults = require("./test-results.json");
 
-const hadErrors = testResults.some((t) => t.status !== 0);
+const hadErrors = testResults.some((t) => !!t.status);
 if (hadErrors) {
   console.error("Errors while running integration tests");
   process.exit(1);

test/integ/generate_test_report.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# Abort the script if any of the commands below is not executed successfully
+set -e
+
+jq \
+    '. + { testResultsFilename: input_filename } | { status, message, result, stack, testResultsFilename }' \
+    test-results-*.json \
+| jq -s > test-results.json
+
+rm test-results-*.json
+
+TEST_REPORTS_DIR="./${TEST_REPORTS_DIR_BASE}/deploy_and_test"
+mkdir -p ${TEST_REPORTS_DIR}
+./format-as-junit.js > ${TEST_REPORTS_DIR}/results.xml
+
+./detect-failed-tests.js