chore(perfomance): Fixing github action to run performance tests in k8s

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

@@ -120,7 +120,7 @@ jobs:
     if: ${{ always() && !failure() && !cancelled() && (github.event_name == 'workflow_dispatch' || needs.check-for-changes.outputs.hasBackendChanges == 'true' || needs.check-for-changes.outputs.hasInfraChanges == 'true') }}
     needs: [deploy-apps, deploy-infra, check-for-changes]
     #needs: [deploy-apps, check-for-changes]
-    uses: ./.github/workflows/workflow-run-k6-performance.yml
+    uses: ./.github/workflows/workflow-run-k6-ci-cd-yt01.yml
     secrets:
       TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
       TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}

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

@@ -31,6 +31,11 @@ on:
         required: true
         default: 1m
         type: string
+      parallelism:
+        description: 'Number of parallel test runs'
+        required: true
+        default: 1
+        type: number  
       testSuitePath:
         description: 'Path to test suite to run'
         required: true
@@ -44,18 +49,21 @@ on:
           - 'tests/k6/tests/graphql/performance/graphql-search.js'
           - 'tests/k6/tests/serviceowner/performance/create-transmissions.js'
 
-run-name: ${{ inputs.tag }} vus ${{ inputs.vus }} duration ${{ inputs.duration }}
+run-name: ${{ inputs.tag }} ${{ inputs.vus }}/${{ inputs.duration }}/${{ inputs.parallelism }}
 jobs:
   k6-performance:
     name: "Run K6 performance test"
     uses: ./.github/workflows/workflow-run-k6-performance.yml
     secrets:
       TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
       TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
+      AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+      AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
     with:
       environment: ${{ inputs.environment }}
       apiVersion: ${{ inputs.apiVersion }}
       testSuitePath: ${{ inputs.testSuitePath }}
       vus: ${{ fromJson(inputs.vus) }}
       duration: ${{ inputs.duration }}
+      parallelism: ${{ fromJson(inputs.parallelism) }}
 

.github/workflows/workflow-run-k6-ci-cd-yt01.yml

@@ -0,0 +1,48 @@
+name: Run K6 performance tests ci/cd yt01
+
+on:
+  workflow_call:
+    inputs:
+      apiVersion:
+        required: true
+        type: string
+      environment:
+        required: true
+        type: string
+      testSuitePath:
+        required: true
+        type: string
+      vus:
+        required: true
+        type: number
+      duration:
+        required: true
+        type: string
+    secrets:
+      TOKEN_GENERATOR_USERNAME:
+        required: true
+      TOKEN_GENERATOR_PASSWORD:
+        required: true
+jobs:
+  k6-test:
+    runs-on: ubuntu-latest
+    environment: ${{ inputs.environment }}
+    permissions:
+      checks: write
+      pull-requests: write
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+    - name: Setup k6
+      uses: grafana/setup-k6-action@v1
+    - name: Run K6 tests (${{ inputs.testSuitePath }})
+      run: |
+        echo "Running k6 test suite ${{ inputs.testSuitePath }} with ${{ inputs.vus }} VUs for ${{ inputs.duration }}"
+        k6 run ${{ inputs.testSuitePath }} --quiet --log-output=stdout --include-system-env-vars \
+          --vus=${{ inputs.vus }} --duration=${{ inputs.duration }} --out csv=./results.csv
+        grep http_req_duration ./results.csv | sort --field-separator=',' --key=3 -nr | head -10
+      env:
+        API_ENVIRONMENT: ${{ inputs.environment }}
+        API_VERSION: ${{ inputs.apiVersion }}
+        TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
+        TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}

.github/workflows/workflow-run-k6-performance.yml

@@ -18,29 +18,60 @@ on:
       duration:
         required: true
         type: string
+      parallelism:
+        required: true
+        type: number
     secrets:
       TOKEN_GENERATOR_USERNAME:
         required: true
       TOKEN_GENERATOR_PASSWORD:
         required: true
+      AZURE_CLIENT_ID:
+        required: true
+      AZURE_TENANT_ID:
+        required: true
+permissions:
+  id-token: write
+  contents: read
 jobs:
   k6-test:
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
-    permissions:
-      checks: write
-      pull-requests: write
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+    - name: OIDC Login to Azure Public Cloud
+      uses: azure/login@v2
+      with:
+        client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        allow-no-subscriptions: true
+    - name: Populate kubeconfig with k6 context
+      id: populate_kubeconfig_with_k6_context
+      shell: bash
+      run: |
+        if ! az aks install-cli; then
+          echo "Failed to install kubectl CLI"
+          exit 1
+        fi
+
+        if ! az aks get-credentials --resource-group k6tests-rg --name k6tests-cluster; then
+          echo "Failed to populate kubeconfig"
+          exit 1
+        fi
+
+        if ! kubelogin convert-kubeconfig -l azurecli; then
+          echo "Failed to convert kubeconfig"
+          exit 1
+        fi
     - name: Setup k6
       uses: grafana/setup-k6-action@v1
     - name: Run K6 tests (${{ inputs.testSuitePath }})
       run: |
-        echo "Running k6 test suite ${{ inputs.testSuitePath }} with ${{ inputs.vus }} VUs for ${{ inputs.duration }}"
-        k6 run ${{ inputs.testSuitePath }} --quiet --log-output=stdout --include-system-env-vars \
-          --vus=${{ inputs.vus }} --duration=${{ inputs.duration }} --out csv=./results.csv
-        grep http_req_duration ./results.csv | sort --field-separator=',' --key=3 -nr | head -10
+        echo "Running k6 test suite ${{ inputs.testSuitePath }} with ${{ inputs.vus }} VUs for ${{ inputs.duration }} on ${{ inputs.parallelism }} parallelism"
+        k6configName=$(basename "${{ inputs.testSuitePath }}" .js)
+        k6configName="k6-${k6configName}"
+        ./tests/k6/tests/scripts/run-test-in-k8s.sh -f ${{ inputs.testSuitePath }} -c $k6configName -n $k6configName -v ${{ inputs.vus }} -d ${{ inputs.duration }} -p ${{ inputs.parallelism }}
       env:
         API_ENVIRONMENT: ${{ inputs.environment }}
         API_VERSION: ${{ inputs.apiVersion }}

tests/k6/tests/enduser/performance/enduser-search.js

@@ -1,8 +1,8 @@
 import { enduserSearch } from '../../performancetest_common/simpleSearch.js'
 import { getDefaultThresholds } from '../../performancetest_common/getDefaultThresholds.js';
-import { endUsers } from '../../performancetest_common/readTestdata.js';
+import { validateTestData } from '../../performancetest_common/readTestdata.js';
+export { setup as setup } from '../../performancetest_common/readTestdata.js';
 
-const isSingleUserMode = (__ENV.isSingleUserMode ?? 'false') === 'true';
 const traceCalls = (__ENV.traceCalls ?? 'false') === 'true';
 
 export let options = {
@@ -19,18 +19,8 @@ export let options = {
     ])
 };
 
-export default function() {
-    if (!endUsers || endUsers.length === 0) {
-        throw new Error('No end users loaded for testing');
-    }
-
-    if (isSingleUserMode) {
-        enduserSearch(endUsers[0], traceCalls);
-    }
-    else {
-        for (let i = 0; i < endUsers.length; i++) {
-            enduserSearch(endUsers[i], traceCalls);
-        }
-    }
+export default function(data) {
+    const { endUsers, index } = validateTestData(data);
+    enduserSearch(endUsers[index], traceCalls);  
 }
 

tests/k6/tests/enduser/performance/enduserSearchWithThresholds.js

@@ -1,3 +1,4 @@
+export { setup as setup } from '../../performancetest_common/readTestdata.js';
 import { default as run } from "./enduser-search.js";
 
 export let options = {

tests/k6/tests/graphql/performance/graphql-search.js

@@ -2,12 +2,11 @@
  * The performance test for GraphQL search.
  * Run: k6 run tests/k6/tests/graphql/performance/graphql-search.js --vus 1 --iterations 1 -e env=yt01
  */
-
 import { getDefaultThresholds } from '../../performancetest_common/getDefaultThresholds.js';
-import { endUsers } from '../../performancetest_common/readTestdata.js';
+import { validateTestData } from '../../performancetest_common/readTestdata.js';
 import { graphqlSearch } from "../../performancetest_common/simpleSearch.js";
+export { setup as setup } from '../../performancetest_common/readTestdata.js';
 
-const isSingleUserMode = (__ENV.isSingleUserMode ?? 'false') === 'true';    
 const traceCalls = (__ENV.traceCalls ?? 'false') === 'true';
 
 
@@ -22,21 +21,9 @@ export const options = {
     thresholds: getDefaultThresholds(['http_req_duration', 'http_reqs'],['graphql search'])
 };
 
-/**
- * The default function for the performance test for GraphQL search.
- */
-export default function() {
-    if (!endUsers || endUsers.length === 0) {
-        throw new Error('No end users loaded for testing');
-    }
-    if (isSingleUserMode) {
-        graphqlSearch(endUsers[0], traceCalls);
-    }
-    else {
-        for (let i = 0; i < endUsers.length; i++) {
-            graphqlSearch(endUsers[i], traceCalls);
-        }
-    }
+export default function(data) {
+    const { endUsers, index } = validateTestData(data);
+    graphqlSearch(endUsers[index], traceCalls);  
 }
 
 

tests/k6/tests/performancetest_common/readTestdata.js

@@ -7,8 +7,8 @@
  */
 
 import papaparse from 'https://jslib.k6.io/papaparse/5.1.1/index.js';
-import { SharedArray } from "k6/data";
-
+import { SharedArray } from 'k6/data';
+import exec from 'k6/execution';
 /**
  * Function to read the CSV file specified by the filename parameter.
  * @param {} filename 
@@ -52,4 +52,50 @@ export const endUsers = new SharedArray('endUsers', function () {
   return readCsv(filenameEndusers); 
 });
 
+function endUsersPart(totalVus, vuId) {
+  const endUsersLength = endUsers.length;
+  if (totalVus == 1) {
+      return endUsers.slice(0, endUsersLength);
+  }
+  let usersPerVU = Math.floor(endUsersLength / totalVus);
+  let extras = endUsersLength % totalVus;
+  let ixStart = (vuId-1) * usersPerVU;
+  if (vuId <= extras) {
+      usersPerVU++;
+      ixStart += vuId - 1;
+  }
+  else {
+      ixStart += extras;
+  }
+  return endUsers.slice(ixStart, ixStart + usersPerVU);
+}
+
+export function setup() {
+  const totalVus = exec.test.options.scenarios.default.vus;
+  let parts = [];
+  for (let i = 1; i <= totalVus; i++) {
+      parts.push(endUsersPart(totalVus, i));
+  }
+  return parts;
+}
+
+export function validateTestData(data, serviceOwners=null) {
+    if (!Array.isArray(data) || !data[exec.vu.idInTest - 1]) {
+        throw new Error('Invalid data structure: expected array of end users');
+    }
+    const myEndUsers = data[exec.vu.idInTest - 1];
+    if (!Array.isArray(myEndUsers) || myEndUsers.length === 0) {
+        throw new Error('Invalid end users array: expected non-empty array');
+    }
+    if (serviceOwners !== null) {
+        if (!Array.isArray(serviceOwners) || serviceOwners.length === 0) {
+            throw new Error('Invalid service owners array: expected non-empty array');
+        }
+    }
+    return {
+        endUsers: myEndUsers,
+        index: exec.vu.iterationInInstance % myEndUsers.length
+    };
+}
+
 

tests/k6/tests/scripts/run-test-in-k8s.sh

@@ -2,6 +2,9 @@
 
 tokengenuser=${TOKEN_GENERATOR_USERNAME}
 tokengenpasswd=${TOKEN_GENERATOR_PASSWORD}
+failed=0
+
+kubectl config set-context --current --namespace=dialogporten
 
 # Validate required environment variables
 if [ -z "$TOKEN_GENERATOR_USERNAME" ] || [ -z "$TOKEN_GENERATOR_PASSWORD" ]; then
@@ -27,17 +30,23 @@ print_logs() {
     K8S_CONTEXT="${K8S_CONTEXT:-k6tests-cluster}"
     K8S_NAMESPACE="${K8S_NAMESPACE:-default}"
     LOG_TIMEOUT="${LOG_TIMEOUT:-60}"
+
     # Verify kubectl access
-    if ! kubectl --context "$K8S_CONTEXT" -n "$K8S_NAMESPACE" get pods &>/dev/null; then
+    if ! kubectl get pods &>/dev/null; then
         echo "Error: Failed to access Kubernetes cluster"
         return 1
     fi
-    for pod in $(kubectl --context "$K8S_CONTEXT" -n "$K8S_NAMESPACE" get pods -l "$POD_LABEL" -o name); do 
+    for pod in $(kubectl get pods -l "$POD_LABEL" -o name); do 
         if [[ $pod != *"initializer"* ]]; then
             echo ---------------------------
             echo $pod
             echo ---------------------------
-            kubectl --context "$K8S_CONTEXT" -n "$K8S_NAMESPACE" logs --tail=-1 $pod
+            kubectl logs --tail=-1 $pod
+            status=`kubectl get $pod -o jsonpath='{.status.phase}'`
+            if [ "$status" != "Succeeded" ]; then
+                failed=1
+            fi
+            echo
         fi
     done
 }
@@ -114,8 +123,9 @@ apiVersion: k6.io/v1alpha1
 kind: TestRun
 metadata:
   name: $name
+  namespace: dialogporten
 spec:
-  arguments: --out experimental-prometheus-rw --vus=$vus --duration=$duration
+  arguments: --out experimental-prometheus-rw --vus=$vus --duration=$duration --tag testid=$testid --log-output=none
   parallelism: $parallelism
   script:
     configMap:
@@ -130,22 +140,24 @@ spec:
     metadata:
       labels:
         k6-test: $name
+    resources:
+      requests:
+        memory: "200Mi"
 
 EOF
 # Apply the config.yml configuration
 kubectl apply -f config.yml
 
 # Wait for the job to finish
 wait_timeout="${duration}100s"
-kubectl --context k6tests-cluster wait --for=jsonpath='{.status.stage}'=finished testrun/$name --timeout=$wait_timeout
-
+kubectl wait --for=jsonpath='{.status.stage}'=finished testrun/$name --timeout=$wait_timeout
 # Print the logs of the pods
 print_logs
 
 cleanup() {
-    local exit_code=$?
-    echo "Cleaning up resources..."
-
+    local exit_code=$failed
+    echo "Sleeping for 15s and then cleaning up resources..."
+    sleep 15
     if [ -f "config.yml" ]; then
         kubectl delete -f config.yml --ignore-not-found || true
         rm -f config.yml