Remove AT21 and AT24 environment references (#2418)

* Remove AT21 and AT24 environment references

* Refactor environment variable usage in Playwright workflow

Author: sonwit

.github/workflows/deploy-at.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        environment: [AT22, AT23, AT24, YT01]
+        environment: [AT22, AT23, YT01]
     uses: "./.github/workflows/template-deploy-container.yml"
     secrets: inherit
     with:

.github/workflows/template-playwright.yml

@@ -11,10 +11,8 @@ on:
         type: choice
         required: true
         options:
-          - AT21
           - AT22
           - AT23
-          - AT24
           - TT02
         description: Environment
 
@@ -57,8 +55,10 @@ jobs:
           MASKINPORTEN_BEHALF_OF_JWK: ${{ secrets.MASKINPORTEN_BEHALF_OF_JWK }}
           AT23_REGISTER_SUBSCRIPTION_KEY: ${{ secrets.AT23_REGISTER_SUBSCRIPTION_KEY }}
           TT02_REGISTER_SUBSCRIPTION_KEY: ${{ secrets.TT02_REGISTER_SUBSCRIPTION_KEY }}
+          ENVIRONMENT: ${{ inputs.environment }}
+          PROJECT: ${{ inputs.project }}
         run: |
-          yarn run env:${{ inputs.environment }} --project ${{ inputs.project }} --workers=4
+          yarn run "env:${ENVIRONMENT}" --project "${PROJECT}" --workers=4
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         if: always()
         with:
@@ -77,11 +77,13 @@ jobs:
       - name: Upload HTML report to Azure
         uses: azure/cli@9f7ce6f37c31b777ec6c6b6d1dfe7db79f497956 # v2
         if: always()
+        env:
+          REPORT_NAME: ${{ inputs.environment }}
+          RUN_ID: ${{ github.run_id }}
         with:
           azcliversion: latest
           inlineScript: |
-            REPORT_NAME=${{ inputs.environment }}                 # e.g. AT24
-            REPORT_ID=${{ github.run_id }}-${{ inputs.environment }}     # unique per job run
+            REPORT_ID="${RUN_ID}-${REPORT_NAME}"     # unique per job run
             ACCOUNT_NAME=playwrightreporting
 
             az storage blob upload-batch \

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI/appsettings.AT21.json

@@ -9,7 +9,6 @@ Run the below command to run Playwright tests with the environment in headless m
 ```cmd
     yarn run env:AT22,
     yarn run env:AT23,
-    yarn run env:AT24,
     yarn run env:TT02
 ```
 
@@ -20,7 +19,7 @@ Run the below command to run Playwright tests with the environment in headless m
 --repeat-each 20 --workers=1: (make sure a test is not flaky in combination with 1 worker to avoid test data complexity)
 --debug: step by step mode
 --grep "test name": match test name to only run specific test(s)
-- full example: yarn run env:AT24 --grep "Delegate api to an organization by selecting from API" --timeout 10000 --repeat-each 20 --workers=1
+- full example: yarn run env:AT23 --grep "Delegate api to an organization by selecting from API" --timeout 10000 --repeat-each 20 --workers=1
 ```
 
 Run the below command to run Playwright tests with the environment in UI mode
@@ -70,8 +69,8 @@ yarn run env:AT22 --grep "test name" --timeout 10000 --repeat-each 10 --workers=
 - Good stability - the tests must build trust.
 - Do cleanup via backend if possible.
 - Easy to understand, should create a better understanding of the functionality in the solution and easy to read reports for test run results.
-- Run the tests against only one of the at-environments(?). We should look at better definitions of the different AT environments (AT24)
-  -- AT21 and AT22 = dev environments
+- Run the tests against only one of the at-environments(?). We should look at better definitions of the different AT environments
+  -- AT22 = dev environment
   -- establish a better standard for what the different environments are used for
 
 Test data - what do we need?

backend/src/Altinn.AccessManagement.UI/Altinn.AccessManagement.UI/appsettings.AT24.json

@@ -5,10 +5,8 @@
   "packageManager": "yarn@4.18.0",
   "main": "index.js",
   "scripts": {
-    "env:AT21": "cross-env environment=at21 npx playwright test",
     "env:AT22": "cross-env environment=at22 npx playwright test",
     "env:AT23": "cross-env environment=at23 npx playwright test",
-    "env:AT24": "cross-env environment=at24 npx playwright test",
     "env:TT02": "cross-env environment=tt02 npx playwright test",
     "tenor": "npx tsx tenor/hentTestpersoner.ts",
     "tenor:virksomhet": "npx tsx tenor/hentVirksomhet.ts",

playwright/README.md

@@ -31,8 +31,8 @@ const config: PlaywrightTestConfig = {
       {
         open: 'on-failure',
         trace: 'on',
-        outputDir: `playwright-report/${process.env.environment?.toUpperCase() ?? 'AT24'}`,
-        outputFolder: `playwright-report/${process.env.environment?.toUpperCase() ?? 'AT24'}`,
+        outputDir: `playwright-report/${process.env.environment?.toUpperCase() ?? 'AT23'}`,
+        outputFolder: `playwright-report/${process.env.environment?.toUpperCase() ?? 'AT23'}`,
       },
     ],
   ],

playwright/package.json

@@ -118,7 +118,7 @@ function printHelp(): void {
       '  -n, --antall <tall>   Antall som hentes (default: 10)',
       '      --kql <kql>       Egendefinert KQL – for persons/orgs (overstyrer standardsøk)',
       '      --json            Skriv ut som JSON',
-      '      --env <miljø>     Miljø for env-fil: tt02, at22, at23, at24 (default: tt02)',
+      '      --env <miljø>     Miljø for env-fil: tt02, at22, at23 (default: tt02)',
       '  -h, --help            Vis denne hjelpeteksten',
     ].join('\n'),
   );

playwright/playwright.config.ts

@@ -92,7 +92,7 @@ function printHelp(): void {
       '      --kql <streng>    Egendefinert KQL (default: bosatt + myndig)',
       '      --navn            Skriv ut navn (fornavn etternavn) ved siden av fnr',
       '      --json            Skriv ut full kildedata som JSON',
-      '      --env <miljø>     Miljø for env-fil: tt02, at22, at23, at24 (default: tt02)',
+      '      --env <miljø>     Miljø for env-fil: tt02, at22, at23 (default: tt02)',
       '  -h, --help            Vis denne hjelpeteksten',
     ].join('\n'),
   );

playwright/tenor/hentBulk.ts

@@ -110,7 +110,7 @@ function printHelp(): void {
       '  -n, --antall <tall>       Antall klienter som hentes (default: 5)',
       '  -m, --maks-klienter <tall> Finn facilitator med færrest klienter, høyst <tall>',
       '      --json                Skriv ut full struktur som JSON',
-      '      --env <miljø>     Miljø for env-fil: tt02, at22, at23, at24 (default: tt02)',
+      '      --env <miljø>     Miljø for env-fil: tt02, at22, at23 (default: tt02)',
       '  -h, --help            Vis denne hjelpeteksten',
     ].join('\n'),
   );