From c9db0d27421c7a82690a88afce4ee989eebf4fe2 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 14:02:00 +0100
Subject: [PATCH 01/16] Enhance Playwright test configuration and reporting for
easier troubleshooting #deploy-test-frontend
---
.github/workflows/common.playwright.yml | 72 ++++++++++++++++++-
.../src/main/js/playwright.config.js | 16 ++++-
.../js/playwright/tests/GruppeHeader.spec.ts | 3 +
3 files changed, 86 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index 19018c1e3e0..8357a449aa2 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -16,8 +16,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- shardIndex: [ 1, 2, 3, 4, 5 ]
- shardTotal: [ 5 ]
+ shardIndex: [ 1, 2, 3 ]
+ shardTotal: [ 3 ]
env:
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
steps:
@@ -35,4 +35,70 @@ jobs:
run: npx playwright install --with-deps
- name: Run Playwright tests
working-directory: ${{ inputs.working-directory }}/src/main/js
- run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
\ No newline at end of file
+ run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+ - name: Upload blob report to GitHub Actions Artifacts
+ if: ${{ !cancelled() }}
+ uses: actions/upload-artifact@v4
+ with:
+ name: blob-report-${{ matrix.shardIndex }}
+ path: blob-report
+ retention-days: 1
+
+ merge-reports:
+ if: ${{ !cancelled() }}
+ needs: [ playwright-tests ]
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-node@v4
+ with:
+ node-version: 22.x
+
+ - name: Download blob reports from GitHub Actions Artifacts
+ uses: actions/download-artifact@v4
+ with:
+ path: all-blob-reports
+ pattern: blob-report-*
+ merge-multiple: true
+
+ - name: Merge into HTML Report
+ run: npx playwright merge-reports --reporter html ./all-blob-reports
+
+ - name: Upload HTML report
+ uses: actions/upload-artifact@v4
+ with:
+ name: html-report--attempt-${{ github.run_attempt }}
+ path: playwright-report
+ retention-days: 14
+
+ - name: Upload HTML report to CDN
+ uses: nais/deploy/actions/cdn-upload/v2@master
+ with:
+ team: dolly
+ source: playwright-report
+ destination: /${{ github.repository }}/${{ github.run_number }}
+ identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+ project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+
+ - name: Merge to json report
+ run: npx playwright merge-reports --reporter json ./all-blob-reports > playwright-report/report.json
+
+ - name: Make fancy GHA Summary
+ run: |
+ total_tests=$(jq '.stats.expected + .stats.unexpected' playwright-report/report.json)
+ passed_tests=$(jq '.stats.expected' playwright-report/report.json)
+ failed_tests=$(jq '.stats.unexpected' playwright-report/report.json)
+ failed_test_info=$(jq -r '.suites[].specs[] | select(.ok == false) | "\(.title) (\(.file), \(.tests[].projectName))"' playwright-report/report.json)
+ echo "## Playwright Test Report Summary" >> $GITHUB_STEP_SUMMARY
+ echo "Total tests: $total_tests ā
" >> $GITHUB_STEP_SUMMARY
+ echo "Passed tests: $passed_tests ā
" >> $GITHUB_STEP_SUMMARY
+ if [ "$failed_tests" -gt 0 ]; then
+ echo "Failed tests: $failed_tests ā" >> $GITHUB_STEP_SUMMARY
+ echo "### Failed Tests:" >> $GITHUB_STEP_SUMMARY
+ while IFS= read -r test; do
+ echo "- $test ā" >> $GITHUB_STEP_SUMMARY
+ done <<< "$failed_test_info"
+ else
+ echo "Failed tests: $failed_tests š¹" >> $GITHUB_STEP_SUMMARY
+ fi
+ echo "Se hele rapporten [her](https://cdn.nav.no/tsm/${{ github.repository }}/${{ github.run_number }}/playwright-report/index.html)." >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
diff --git a/apps/dolly-frontend/src/main/js/playwright.config.js b/apps/dolly-frontend/src/main/js/playwright.config.js
index 330cd30886d..b3a525c4317 100644
--- a/apps/dolly-frontend/src/main/js/playwright.config.js
+++ b/apps/dolly-frontend/src/main/js/playwright.config.js
@@ -18,11 +18,23 @@ export default defineConfig({
// One worker on CI to make tests more stable
workers: process.env.CI ? 1 : 3,
- reporter: 'html',
- /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+ reporter: [
+ [
+ 'html',
+ {
+ attachments: true,
+ outputFolder: 'playwright-report',
+ },
+ ],
+ ],
+
use: {
baseURL: 'http://localhost:5678/',
trace: 'on-first-retry',
+ screenshot: {
+ mode: 'on',
+ fullPage: true,
+ },
},
/* Configure projects for major browsers */
diff --git a/apps/dolly-frontend/src/main/js/playwright/tests/GruppeHeader.spec.ts b/apps/dolly-frontend/src/main/js/playwright/tests/GruppeHeader.spec.ts
index 6595f835b78..0ee58258495 100644
--- a/apps/dolly-frontend/src/main/js/playwright/tests/GruppeHeader.spec.ts
+++ b/apps/dolly-frontend/src/main/js/playwright/tests/GruppeHeader.spec.ts
@@ -15,6 +15,9 @@ test.describe('Testing av forskjellige actions pƄ gruppeheaderen', () => {
await page.getByTestId(TestComponentSelectors.BUTTON_VIDERE).click()
await page.getByTestId(TestComponentSelectors.BUTTON_FULLFOER_BESTILLING).click()
+ // TODO: SLETT DENNE, FORCE FAIL AV TEST
+ await page.getByTestId(TestComponentSelectors.BUTTON_MINSIDE_ENDRE_MALNAVN).click()
+
// Testing av tags
await page.goto('gruppe')
await page
From a1ccb0508f1e2535a9822649d2782a891a05aa8f Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 14:11:05 +0100
Subject: [PATCH 02/16] - Endret beskrivelse for bestilling, slik at importerte
personer kan ha med dette i selve bestillingen #deploy-test-dolly-backend
---
.github/workflows/common.playwright.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index 8357a449aa2..578814dc6c4 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -39,6 +39,7 @@ jobs:
- name: Upload blob report to GitHub Actions Artifacts
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
+ working-directory: ${{ inputs.working-directory }}/src/main/js
with:
name: blob-report-${{ matrix.shardIndex }}
path: blob-report
@@ -47,6 +48,7 @@ jobs:
merge-reports:
if: ${{ !cancelled() }}
needs: [ playwright-tests ]
+ working-directory: ${{ inputs.working-directory }}/src/main/js
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
From e89e4a1b68533d92776be20cb8b9b7c9f69692e5 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 14:33:46 +0100
Subject: [PATCH 03/16] - Endret beskrivelse for bestilling, slik at importerte
personer kan ha med dette i selve bestillingen #deploy-test-dolly-backend
---
.github/workflows/common.playwright.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index 578814dc6c4..9090e6cf163 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -64,9 +64,11 @@ jobs:
merge-multiple: true
- name: Merge into HTML Report
+ working-directory: ${{ inputs.working-directory }}/src/main/js
run: npx playwright merge-reports --reporter html ./all-blob-reports
- name: Upload HTML report
+ working-directory: ${{ inputs.working-directory }}/src/main/js
uses: actions/upload-artifact@v4
with:
name: html-report--attempt-${{ github.run_attempt }}
@@ -74,6 +76,7 @@ jobs:
retention-days: 14
- name: Upload HTML report to CDN
+ working-directory: ${{ inputs.working-directory }}/src/main/js
uses: nais/deploy/actions/cdn-upload/v2@master
with:
team: dolly
@@ -83,9 +86,11 @@ jobs:
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
- name: Merge to json report
+ working-directory: ${{ inputs.working-directory }}/src/main/js
run: npx playwright merge-reports --reporter json ./all-blob-reports > playwright-report/report.json
- name: Make fancy GHA Summary
+ working-directory: ${{ inputs.working-directory }}/src/main/js
run: |
total_tests=$(jq '.stats.expected + .stats.unexpected' playwright-report/report.json)
passed_tests=$(jq '.stats.expected' playwright-report/report.json)
From 61b8175df29d262b10a9332c0422f5a6f24e2bb4 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 14:38:58 +0100
Subject: [PATCH 04/16] - Endret beskrivelse for bestilling, slik at importerte
personer kan ha med dette i selve bestillingen #deploy-test-dolly-backend
---
.github/workflows/common.playwright.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index 9090e6cf163..59d17d1d2a9 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -39,7 +39,6 @@ jobs:
- name: Upload blob report to GitHub Actions Artifacts
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v4
- working-directory: ${{ inputs.working-directory }}/src/main/js
with:
name: blob-report-${{ matrix.shardIndex }}
path: blob-report
@@ -48,7 +47,6 @@ jobs:
merge-reports:
if: ${{ !cancelled() }}
needs: [ playwright-tests ]
- working-directory: ${{ inputs.working-directory }}/src/main/js
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -68,7 +66,6 @@ jobs:
run: npx playwright merge-reports --reporter html ./all-blob-reports
- name: Upload HTML report
- working-directory: ${{ inputs.working-directory }}/src/main/js
uses: actions/upload-artifact@v4
with:
name: html-report--attempt-${{ github.run_attempt }}
@@ -76,7 +73,6 @@ jobs:
retention-days: 14
- name: Upload HTML report to CDN
- working-directory: ${{ inputs.working-directory }}/src/main/js
uses: nais/deploy/actions/cdn-upload/v2@master
with:
team: dolly
From 2ee628bae78dc10fa62c839828fb3930a2ca9a30 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 14:46:08 +0100
Subject: [PATCH 05/16] - Endret beskrivelse for bestilling, slik at importerte
personer kan ha med dette i selve bestillingen #deploy-test-dolly-backend
---
.github/workflows/common.playwright.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index 59d17d1d2a9..0b4f67c3cc9 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -69,7 +69,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: html-report--attempt-${{ github.run_attempt }}
- path: playwright-report
+ path: ${{ inputs.working-directory }}/src/main/js/playwright-report
retention-days: 14
- name: Upload HTML report to CDN
From 3bf6c4602468133450872ec5787bb5b00b59911b Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 14:59:55 +0100
Subject: [PATCH 06/16] - Endret beskrivelse for bestilling, slik at importerte
personer kan ha med dette i selve bestillingen #deploy-test-dolly-backend
---
.github/workflows/common.playwright.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index 0b4f67c3cc9..e437c1f34e9 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -41,7 +41,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: blob-report-${{ matrix.shardIndex }}
- path: blob-report
+ path: ${{ inputs.working-directory }}/src/main/js/blob-report
retention-days: 1
merge-reports:
@@ -57,7 +57,7 @@ jobs:
- name: Download blob reports from GitHub Actions Artifacts
uses: actions/download-artifact@v4
with:
- path: all-blob-reports
+ path: ${{ inputs.working-directory }}/src/main/js/all-blob-reports
pattern: blob-report-*
merge-multiple: true
@@ -104,4 +104,4 @@ jobs:
else
echo "Failed tests: $failed_tests š¹" >> $GITHUB_STEP_SUMMARY
fi
- echo "Se hele rapporten [her](https://cdn.nav.no/tsm/${{ github.repository }}/${{ github.run_number }}/playwright-report/index.html)." >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
+ echo "Se hele rapporten [her](https://cdn.nav.no/dolly/${{ github.repository }}/${{ github.run_number }}/playwright-report/index.html)." >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
From 3687da63d7fd68c52ab4d87d96cc943222f1392a Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 15:07:48 +0100
Subject: [PATCH 07/16] Enhance Playwright test configuration and reporting for
easier troubleshooting
---
apps/dolly-frontend/src/main/js/playwright.config.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/dolly-frontend/src/main/js/playwright.config.js b/apps/dolly-frontend/src/main/js/playwright.config.js
index b3a525c4317..6c7a12acea8 100644
--- a/apps/dolly-frontend/src/main/js/playwright.config.js
+++ b/apps/dolly-frontend/src/main/js/playwright.config.js
@@ -20,10 +20,9 @@ export default defineConfig({
reporter: [
[
- 'html',
+ process.env.CI ? 'blob' : 'html',
{
attachments: true,
- outputFolder: 'playwright-report',
},
],
],
From fec5507a267956284e531a674885ef825b45a110 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 15:15:43 +0100
Subject: [PATCH 08/16] - Endret beskrivelse for bestilling, slik at importerte
personer kan ha med dette i selve bestillingen #deploy-test-dolly-backend
---
.github/workflows/common.playwright.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index e437c1f34e9..a9d6e9b5e40 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -9,6 +9,12 @@ on:
secrets:
READER_TOKEN:
required: true
+
+permissions:
+ contents: read
+ id-token: write
+ packages: write
+
jobs:
playwright-tests:
timeout-minutes: 15
From acf98385ae6f6ef27516950190b6dca52462ccf5 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 15:18:35 +0100
Subject: [PATCH 09/16] - Endret beskrivelse for bestilling, slik at importerte
personer kan ha med dette i selve bestillingen #deploy-test-dolly-backend
---
.github/workflows/app.dolly-frontend.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml
index d8dfc7b61ca..9922f9133e5 100644
--- a/.github/workflows/app.dolly-frontend.yml
+++ b/.github/workflows/app.dolly-frontend.yml
@@ -1,5 +1,10 @@
name: dolly-frontend
+permissions:
+ contents: read
+ id-token: write
+ packages: write
+
on:
push:
paths:
@@ -21,6 +26,10 @@ jobs:
uses: ./.github/workflows/common.playwright.yml
with:
working-directory: "apps/dolly-frontend"
+ permissions:
+ contents: read
+ id-token: write
+ packages: write
secrets:
READER_TOKEN: ${{ secrets.READER_TOKEN }}
From 8479f66b534d2ffd2ef5a219777204aed3cef859 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 15:26:12 +0100
Subject: [PATCH 10/16] - Endret beskrivelse for bestilling, slik at importerte
personer kan ha med dette i selve bestillingen #deploy-test-dolly-backend
---
.github/workflows/common.playwright.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index a9d6e9b5e40..899b3bb88c8 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -82,7 +82,7 @@ jobs:
uses: nais/deploy/actions/cdn-upload/v2@master
with:
team: dolly
- source: playwright-report
+ source: ${{ inputs.working-directory }}/src/main/js/playwright-report
destination: /${{ github.repository }}/${{ github.run_number }}
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
From a48245ef938b482f8ef39c6901210322038ce5f1 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 15:34:01 +0100
Subject: [PATCH 11/16] Se om project_id trengs, eller om den er deprecated i
cdn-upload #deploy-test-dolly-backend
---
.github/workflows/common.playwright.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index 899b3bb88c8..662b6b08efd 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -85,7 +85,7 @@ jobs:
source: ${{ inputs.working-directory }}/src/main/js/playwright-report
destination: /${{ github.repository }}/${{ github.run_number }}
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
- project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+ # project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
- name: Merge to json report
working-directory: ${{ inputs.working-directory }}/src/main/js
From c0b4edb75859c0fb8b604534680d3ed6018e56ef Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Tue, 11 Mar 2025 15:52:54 +0100
Subject: [PATCH 12/16] Fixed failing test
---
.../src/main/js/playwright/tests/GruppeHeader.spec.ts | 3 ---
1 file changed, 3 deletions(-)
diff --git a/apps/dolly-frontend/src/main/js/playwright/tests/GruppeHeader.spec.ts b/apps/dolly-frontend/src/main/js/playwright/tests/GruppeHeader.spec.ts
index 0ee58258495..6595f835b78 100644
--- a/apps/dolly-frontend/src/main/js/playwright/tests/GruppeHeader.spec.ts
+++ b/apps/dolly-frontend/src/main/js/playwright/tests/GruppeHeader.spec.ts
@@ -15,9 +15,6 @@ test.describe('Testing av forskjellige actions pƄ gruppeheaderen', () => {
await page.getByTestId(TestComponentSelectors.BUTTON_VIDERE).click()
await page.getByTestId(TestComponentSelectors.BUTTON_FULLFOER_BESTILLING).click()
- // TODO: SLETT DENNE, FORCE FAIL AV TEST
- await page.getByTestId(TestComponentSelectors.BUTTON_MINSIDE_ENDRE_MALNAVN).click()
-
// Testing av tags
await page.goto('gruppe')
await page
From 23819bce7f1264bec47c39b2ec6064fa70e39b1d Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 12 Mar 2025 11:44:11 +0100
Subject: [PATCH 13/16] Mer intuitiv permission handling i workflow etter
kommentar #deploy-test-frontend
---
.github/workflows/all.workflows.yml | 3 +++
.github/workflows/app.dolly-frontend.yml | 18 ++++++------------
.github/workflows/common.playwright.yml | 5 -----
.../web/DollyFrontendApplicationStarter.java | 2 +-
4 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/all.workflows.yml b/.github/workflows/all.workflows.yml
index 38fd815bb4c..ec520f3369a 100644
--- a/.github/workflows/all.workflows.yml
+++ b/.github/workflows/all.workflows.yml
@@ -59,6 +59,9 @@ jobs:
frontend:
if: inputs.workflow == 'frontend'
uses: ./.github/workflows/common.workflow.frontend.yml
+ permissions:
+ packages: write
+
with:
cluster: ${{ inputs.cluster }}
working-directory: "${{ inputs.type }}/${{ inputs.name }}"
diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml
index 9922f9133e5..9a5c1d75d36 100644
--- a/.github/workflows/app.dolly-frontend.yml
+++ b/.github/workflows/app.dolly-frontend.yml
@@ -1,10 +1,5 @@
name: dolly-frontend
-permissions:
- contents: read
- id-token: write
- packages: write
-
on:
push:
paths:
@@ -21,15 +16,17 @@ on:
- ".github/workflows/app.dolly-frontend.yml"
- ".github/workflows/common.playwright.yml"
+permissions:
+ contents: read
+ id-token: write
+
jobs:
playwright:
uses: ./.github/workflows/common.playwright.yml
- with:
- working-directory: "apps/dolly-frontend"
permissions:
- contents: read
- id-token: write
packages: write
+ with:
+ working-directory: "apps/dolly-frontend"
secrets:
READER_TOKEN: ${{ secrets.READER_TOKEN }}
@@ -41,7 +38,4 @@ jobs:
deploy-tag-test: "#deploy-test-frontend"
deploy-tag-idporten: "#deploy-idporten-frontend"
deploy-tag-unstable: "#deploy-unstable-frontend"
- permissions:
- contents: read
- id-token: write
secrets: inherit
diff --git a/.github/workflows/common.playwright.yml b/.github/workflows/common.playwright.yml
index 662b6b08efd..47dcbae3b9e 100644
--- a/.github/workflows/common.playwright.yml
+++ b/.github/workflows/common.playwright.yml
@@ -10,11 +10,6 @@ on:
READER_TOKEN:
required: true
-permissions:
- contents: read
- id-token: write
- packages: write
-
jobs:
playwright-tests:
timeout-minutes: 15
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index e21266c588f..62e2b9aa958 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -148,4 +148,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
.filters(filter, removeCookiesFilter, addUserJwtHeaderFilter())
).uri(host);
}
-}
\ No newline at end of file
+}
From 98b5b82820a937c1a845af200904b3c423b63d54 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 12 Mar 2025 11:58:59 +0100
Subject: [PATCH 14/16] Tester fix #deploy-test-frontend
---
.github/workflows/all.workflows.yml | 2 ++
.github/workflows/app.dolly-frontend.yml | 6 ------
.../no/nav/dolly/web/DollyFrontendApplicationStarter.java | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/all.workflows.yml b/.github/workflows/all.workflows.yml
index ec520f3369a..326836b25cd 100644
--- a/.github/workflows/all.workflows.yml
+++ b/.github/workflows/all.workflows.yml
@@ -61,6 +61,8 @@ jobs:
uses: ./.github/workflows/common.workflow.frontend.yml
permissions:
packages: write
+ contents: read
+ id-token: write
with:
cluster: ${{ inputs.cluster }}
diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml
index 9a5c1d75d36..6ede99cc6c3 100644
--- a/.github/workflows/app.dolly-frontend.yml
+++ b/.github/workflows/app.dolly-frontend.yml
@@ -16,15 +16,9 @@ on:
- ".github/workflows/app.dolly-frontend.yml"
- ".github/workflows/common.playwright.yml"
-permissions:
- contents: read
- id-token: write
-
jobs:
playwright:
uses: ./.github/workflows/common.playwright.yml
- permissions:
- packages: write
with:
working-directory: "apps/dolly-frontend"
secrets:
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index 62e2b9aa958..e21266c588f 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -148,4 +148,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
.filters(filter, removeCookiesFilter, addUserJwtHeaderFilter())
).uri(host);
}
-}
+}
\ No newline at end of file
From c12e408991f3c6676a6412d00c99fcdd71105028 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 12 Mar 2025 13:29:54 +0100
Subject: [PATCH 15/16] Tester fix v2 #deploy-test-frontend
---
.github/workflows/all.workflows.yml | 2 --
.github/workflows/app.dolly-frontend.yml | 8 ++++++++
.../no/nav/dolly/web/DollyFrontendApplicationStarter.java | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/all.workflows.yml b/.github/workflows/all.workflows.yml
index 326836b25cd..ec520f3369a 100644
--- a/.github/workflows/all.workflows.yml
+++ b/.github/workflows/all.workflows.yml
@@ -61,8 +61,6 @@ jobs:
uses: ./.github/workflows/common.workflow.frontend.yml
permissions:
packages: write
- contents: read
- id-token: write
with:
cluster: ${{ inputs.cluster }}
diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml
index 6ede99cc6c3..266ce8678cd 100644
--- a/.github/workflows/app.dolly-frontend.yml
+++ b/.github/workflows/app.dolly-frontend.yml
@@ -19,6 +19,10 @@ on:
jobs:
playwright:
uses: ./.github/workflows/common.playwright.yml
+ permissions:
+ packages: write
+ id-token: write
+ contents: read
with:
working-directory: "apps/dolly-frontend"
secrets:
@@ -26,6 +30,10 @@ jobs:
workflow:
uses: ./.github/workflows/common.workflow.frontend.yml
+ permissions:
+ packages: write
+ id-token: write
+ contents: read
with:
working-directory: "apps/dolly-frontend"
deploy-tag: "#deploy-frontend"
diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
index e21266c588f..62e2b9aa958 100644
--- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
+++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java
@@ -148,4 +148,4 @@ private Function<PredicateSpec, Buildable<Route>> createRoute(String segment, St
.filters(filter, removeCookiesFilter, addUserJwtHeaderFilter())
).uri(host);
}
-}
\ No newline at end of file
+}
From 23f34f9fc45c7fa4b0f1dc499341f35498581ea7 Mon Sep 17 00:00:00 2001
From: stigus <stian.gustavsson@nav.no>
Date: Wed, 12 Mar 2025 13:40:03 +0100
Subject: [PATCH 16/16] Tester deploy backend #deploy-test-dolly-backend
---
.github/workflows/all.workflows.yml | 1 -
.../main/java/no/nav/dolly/DollyBackendApplicationStarter.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/all.workflows.yml b/.github/workflows/all.workflows.yml
index ec520f3369a..a76f3b710da 100644
--- a/.github/workflows/all.workflows.yml
+++ b/.github/workflows/all.workflows.yml
@@ -42,7 +42,6 @@ permissions:
id-token: write
jobs:
-
backend:
if: inputs.workflow == 'backend'
uses: ./.github/workflows/common.workflow.backend.yml
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
index 11bf37497d2..66316f20270 100644
--- a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
+++ b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
@@ -14,4 +14,4 @@ public static void main(String[] args) {
.initializers(new NaisEnvironmentApplicationContextInitializer())
.run(args);
}
-}
+}
\ No newline at end of file