chore: Enable K6 functional test run after app deploy to test/staging

.github/workflows/dispatch-e2e-tests.yml → .github/workflows/action-run-k6-tests.yml

@@ -1,16 +1,22 @@
-name: End-to-end tests
+name: Run K6 tests
 
 on:
-  workflow_dispatch:
+  workflow_call:
     inputs:
       apiVersion:
-        description: 'API Version'
         required: true
-        default: 'v1'
+        type: string   
       environment:
-        description: 'Environment (poc, test, staging)'
         required: true
-        default: 'poc'
+        type: string
+      testSuitePath:
+        required: true
+        type: string
+    secrets:
+      TOKEN_GENERATOR_USERNAME:
+        required: true
+      TOKEN_GENERATOR_PASSWORD:
+        required: true
 
 jobs:
   k6-test:
@@ -20,14 +26,14 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Run K6 tests
+    - name: Run K6 tests (${{ inputs.testSuitePath }})
       uses: grafana/k6-action@v0.3.1
       with:
-        filename: tests/k6/suites/all-single-pass.js
+        filename: ${{ inputs.testSuitePath }}
         #flags: --quiet --log-output=stdout --include-system-env-vars
       env:
-        API_ENVIRONMENT: ${{ github.event.inputs.environment }}
-        API_VERSION: ${{ github.event.inputs.apiVersion }}
+        API_ENVIRONMENT: ${{ inputs.environment }}
+        API_VERSION: ${{ inputs.apiVersion }}
         TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
         TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}  
 

.github/workflows/ci-cd-main.yml

@@ -120,3 +120,14 @@ jobs:
       function-app-name: "dp-be-test-slacknotifier-fa"
       function-project-path: "./src/Digdir.Tool.Dialogporten.SlackNotifier"
       environment: test
+
+  run-e2e-tests:
+    name: "Run K6 functional end-to-end tests"
+    uses: ./.github/workflows/action-run-k6-tests.yml
+    secrets:
+      TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
+      TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
+    with:
+      environment: test
+      apiVersion: v1
+      testSuitePath: tests/k6/suites/all-single-pass.js

.github/workflows/ci-cd-staging.yml

@@ -67,3 +67,14 @@ jobs:
       environment: staging
       region: norwayeast
       version: ${{ needs.get-current-version.outputs.version }}
+
+  run-e2e-tests:
+    name: "Run K6 functional end-to-end tests"
+    uses: ./.github/workflows/action-run-k6-tests.yml
+    secrets:
+      TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
+      TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
+    with:
+      environment: staging
+      apiVersion: v1
+      testSuitePath: tests/k6/suites/all-single-pass.js

.github/workflows/dispatch-k6-tests.yml

@@ -0,0 +1,33 @@
+name: Run K6 tests
+
+on:
+  workflow_dispatch:
+    inputs:
+      apiVersion:
+        description: 'API Version'
+        required: true
+        default: 'v1'
+      environment:
+        description: 'Environment'
+        required: true
+        default: 'test'
+        type: choice
+        options:
+          - test
+          - staging
+      testSuitePath:
+        description: 'Path to test suite to run'
+        required: true
+        default: 'tests/k6/suites/all-single-pass.js'
+
+jobs:
+  k6-test:
+    name: "Run K6 tests"
+    uses: ./.github/workflows/action-run-k6-tests.yml
+    secrets:
+      TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
+      TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
+    with:
+      environment: ${{ inputs.environment }}
+      apiVersion: ${{ inputs.apiVersion }}
+      testSuitePath: ${{ inputs.testSuitePath }}

tests/k6/tests/serviceowner/performance/createremove-no-delay.js

@@ -1,4 +1,4 @@
-import { postSO, deleteSO, expect, describe, getServiceOwnerTokenFromGenerator } from "../../../common/testimports.js";
+import { postSO, purgeSO, expect, describe, getServiceOwnerTokenFromGenerator } from "../../../common/testimports.js";
 import { default as dialogToInsert } from '../testdata/01-create-dialog.js';
 
 export function setup() {
@@ -21,7 +21,7 @@ export default function(paramsWithToken) {
 
     describe('remove dialog', () => {
         if (dialogId) {
-            let r = deleteSO('dialogs/' + dialogId, paramsWithToken);   
+            let r = purgeSO('dialogs/' + dialogId, paramsWithToken);   
             expect(r.status, 'response status').to.equal(204);
         }
     });