Fixing the post-proc job for cancelling the completion skipped runs.

.github/workflows/pr_check_load_test.yml

@@ -133,3 +133,82 @@ jobs:
             exit 1
           fi
         shell: bash
+
+  run-skip-wait-integration-test:
+    environment: automation test
+    name: Validate PR for Skip wait.
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 20
+
+      - name: Installing dependencies and building latest changes
+        if: github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && github.base_ref == 'main')
+        run: |
+          npm install --include=dev -f
+          npm ci
+        shell: bash
+
+      - name: Azure authentication
+        uses: azure/login@v1
+        continue-on-error: false
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+      - name: Generate GUID
+        id: guid
+        run: |
+            if [[ "${{ runner.os }}" == "Windows" ]]; then
+              echo "::set-output name=GUID::$(powershell -Command "[guid]::NewGuid().ToString()")"
+            else
+              echo "::set-output name=GUID::$(uuidgen)"
+            fi
+        shell : bash
+
+      - name: Set Secrets
+        id: secrets
+        run: |
+            secrets="${{ matrix.secrets }}"
+            echo "::set-output name=secrets::$(echo "$secrets" | sed "s/'/\"/g")"
+        shell : bash
+
+      - name: Set Env vars
+        id: env
+        run: |
+            env="${{ matrix.env }}"
+            echo "::set-output name=env::$(echo "$env" | sed "s/'/\"/g")"
+        shell : bash
+
+      - name: 'Azure Load Testing'
+        uses: ./
+        id: alt
+        with:
+          loadTestConfigFile: ./E2ETests/ConfigFiles/basic-test-url.yaml
+          loadTestResource: ${{ env.LOAD_TEST_RESOURCE }}
+          resourceGroup: ${{ env.LOAD_TEST_RESOURCE_GROUP }}
+          overRideParameters: "{\"testId\":\"${{ steps.guid.outputs.GUID }}\"}"
+          outputVariableName: 'loadTestRunId'
+          waitForCompletion: false
+        continue-on-error: true
+
+      - name: Print the Output
+        run: echo "The Test ID is ${{ steps.alt.outputs['loadTestRunId.testRunId'] }}"
+        shell: bash
+
+      - name: Check for results and report files
+        run: |
+          if [[ -d "./loadTest" ]]; then
+            echo "loadTest directory is created, should have been skipped."
+            exit 0
+          else
+            echo "loadTest directory is missing as expected, good to go."
+            exit 0
+          fi
+        shell: bash

lib/RunnerFiles/CreateAndRunTest.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -96,12 +86,13 @@ class CreateAndRunTest {
             if (waitForRunCompletionInput) {
                 yield this.awaitTerminationForTestRun(testRunResult.testRunId, this.apiService);
                 testRunResult = (_a = yield this.awaitResultsPopulation(testRunResult.testRunId, this.apiService)) !== null && _a !== void 0 ? _a : testRunResult;
-                CoreUtils.exportVariable(UtilModels_1.PostTaskParameters.isRunCompleted, 'true');
+                CoreUtils.exportVariable(UtilModels_1.PostTaskParameters.skipPostProcessing, 'true');
                 this.printMetrics(testRunResult);
                 yield this.uploadResultsToPipeline(testRunResult);
                 this.setTaskResults(testRunResult);
             }
             else {
+                CoreUtils.exportVariable(UtilModels_1.PostTaskParameters.skipPostProcessing, 'true');
                 console.log("Test run started. Not waiting for completion as per input.");
                 this.setRunStarted();
             }

lib/main.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -63,8 +53,8 @@ function run() {
             if (fs.existsSync(UtilModels_1.resultFolder)) {
                 util.deleteFile(UtilModels_1.resultFolder);
             }
-            fs.mkdirSync(UtilModels_1.resultFolder);
             let waitForRunCompletionInput = CoreUtils.getBoolInput(InputConstants.waitForCompletion, true);
+            waitForRunCompletionInput && fs.mkdirSync(UtilModels_1.resultFolder); // only make when the wait is true, else folder creation iis un-necessary.
             let runner = new CreateAndRunTest_1.CreateAndRunTest(apiService);
             runner.createAndRunTest(waitForRunCompletionInput);
         }

lib/models/UtilModels.js

@@ -60,7 +60,7 @@ var PostTaskParameters;
 (function (PostTaskParameters) {
     PostTaskParameters.runId = 'LOADTEST_RUNID';
     PostTaskParameters.baseUri = 'LOADTEST_RESOURCE_URI';
-    PostTaskParameters.isRunCompleted = 'LOADTEST_RUN_COMPLETED'; // this is set when the task is completed, to avoid get calls for the test again.
+    PostTaskParameters.skipPostProcessing = 'LOADTEST_SKIP_POST_PROCESSING'; // this is set when post-processing (stopping the run) should be skipped, i.e. the run already completed or completion was intentionally skipped.
 })(PostTaskParameters || (exports.PostTaskParameters = PostTaskParameters = {}));
 var OutPutVariablesConstants;
 (function (OutPutVariablesConstants) {

lib/postProcessJob.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -42,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = run;
+exports.run = void 0;
 const UtilModels_1 = require("./models/UtilModels");
 const CoreUtils = __importStar(require("./Utils/CoreUtils"));
 const AuthenticatorService_1 = require("./services/AuthenticatorService");
@@ -54,8 +44,8 @@ function run() {
         try {
             const runId = process.env[UtilModels_1.PostTaskParameters.runId];
             const baseUri = process.env[UtilModels_1.PostTaskParameters.baseUri];
-            const isRunCompleted = process.env[UtilModels_1.PostTaskParameters.isRunCompleted];
-            if (!(0, CommonUtils_1.isNullOrUndefined)(runId) && !(0, CommonUtils_1.isNullOrUndefined)(baseUri) && ((0, CommonUtils_1.isNullOrUndefined)(isRunCompleted) || isRunCompleted != 'true')) {
+            const skipPostProcessing = process.env[UtilModels_1.PostTaskParameters.skipPostProcessing];
+            if (!(0, CommonUtils_1.isNullOrUndefined)(runId) && !(0, CommonUtils_1.isNullOrUndefined)(baseUri) && ((0, CommonUtils_1.isNullOrUndefined)(skipPostProcessing) || skipPostProcessing != 'true')) {
                 console.log("Stopping the test run");
                 let taskParameters = yield TaskParametersUtil_1.TaskParametersUtil.getTaskParameters(true);
                 const authContext = new AuthenticatorService_1.AuthenticatorService(taskParameters);
@@ -69,4 +59,5 @@ function run() {
         }
     });
 }
+exports.run = run;
 run();