fix workflows

Altinn · Jan 7, 2025 · 5b959ba · 5b959ba
1 parent b415481
commit 5b959ba
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 44 deletions.
diff --git a/.github/workflows/ci-cd-yt01.yml b/.github/workflows/ci-cd-yt01.yml
@@ -150,8 +150,6 @@ jobs:
     secrets:
       TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
       TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
-      K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
-      K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
 
     strategy:
       max-parallel: 1
@@ -166,8 +164,6 @@ jobs:
       apiVersion: v1
       vus: 1
       duration: 30s
-      tokens: both
-      numberOfTokens: 100
       testSuitePath: ${{ matrix.files }}
     permissions:
       checks: write

diff --git a/.github/workflows/dispatch-k6-performance.yml b/.github/workflows/dispatch-k6-performance.yml
@@ -16,16 +16,6 @@ on:
           - test
           - staging
           - yt01
-      tokens:
-        description: 'Tokens to generate; for create dialog, search, none, or both'
-        required: true
-        default: 'both'
-        type: choice
-        options:
-          - both
-          - enterprise
-          - personal
-          - none
       tag:
         description: 'tag the performance test'
         required: true
@@ -61,13 +51,10 @@ jobs:
     secrets:
       TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
       TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
-      K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
-      K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
     with:
       environment: ${{ inputs.environment }}
       apiVersion: ${{ inputs.apiVersion }}
       testSuitePath: ${{ inputs.testSuitePath }}
       vus: ${{ fromJson(inputs.vus) }}
       duration: ${{ inputs.duration }}
-      tokens: ${{ inputs.tokens }}
 
diff --git a/.github/workflows/workflow-run-k6-performance.yml b/.github/workflows/workflow-run-k6-performance.yml
@@ -18,27 +18,11 @@ on:
       duration:
         required: true
         type: string
-      tokens:
-        required: true
-        type: string
-      numberOfTokens:
-        required: false
-        type: number
-        default: 0  
-      ttl:
-        required: false
-        type: number
-        default: 3600  
     secrets:
       TOKEN_GENERATOR_USERNAME:
         required: true
       TOKEN_GENERATOR_PASSWORD:
         required: true
-      K6_CLOUD_TOKEN:
-        required: true
-      K6_CLOUD_PROJECT_ID:
-        required: true
-
 jobs:
   k6-test:
     runs-on: ubuntu-latest
@@ -53,7 +37,6 @@ jobs:
       uses: grafana/setup-k6-action@v1
     - name: Run K6 tests (${{ inputs.testSuitePath }})
       run: |
-        ./tests/k6/tests/scripts/generate_tokens.sh ./tests/k6/tests/performancetest_data ${{ inputs.tokens }} ${{ inputs.numberOfTokens }} ${{ inputs.ttl }}
         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
@@ -63,5 +46,3 @@ jobs:
         API_VERSION: ${{ inputs.apiVersion }}
         TOKEN_GENERATOR_USERNAME: ${{ secrets.TOKEN_GENERATOR_USERNAME }}
         TOKEN_GENERATOR_PASSWORD: ${{ secrets.TOKEN_GENERATOR_PASSWORD }}
-        K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
-        K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
diff --git a/tests/k6/tests/performancetest_data/01-create-dialog.js b/tests/k6/tests/performancetest_data/01-create-dialog.js
@@ -55,13 +55,5 @@ export default function (endUser, resource) {
     payload.serviceResource = "urn:altinn:resource:" +resource;
     payload.party = "urn:altinn:person:identifier-no:" + endUser;
 
-    // const firstTransmission = payload.transmissions[0];
-    // const copyOfFirstTransmission = { ...firstTransmission };
-    // for (let i = 0; i < 155; i++) {
-    //     payload.transmissions.push(copyOfFirstTransmission);
-    // }
-    // console.log(payload.transmissions.length);
-    // console.log(endUser, resource);
-
     return cleanUp(payload);
 }