From 24143ed20f0b5c48331bfe67817668136ff0eda0 Mon Sep 17 00:00:00 2001 From: Aleksi Ahtiainen Date: Mon, 21 Oct 2024 15:01:51 +0300 Subject: [PATCH] WIP --- .github/actions/omadataoauth2_e2e_test/action.yml | 3 ++- omadata-oauth2-sample/client/playwright.config.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/omadataoauth2_e2e_test/action.yml b/.github/actions/omadataoauth2_e2e_test/action.yml index db13c2668e2..dce56fbb5c4 100644 --- a/.github/actions/omadataoauth2_e2e_test/action.yml +++ b/.github/actions/omadataoauth2_e2e_test/action.yml @@ -23,9 +23,10 @@ runs: PLAYWRIGHT_HTML_REPORT: omadataoauth2-e2e-report-${{inputs.shardIndex}}-of-${{inputs.shardTotal}} uses: nick-fields/retry@v3 with: - max_attempts: 2 + max_attempts: 1 timeout_minutes: 45 command: mvn scalatest:test -Pomadataoauth2e2e -Dsuites="fi.oph.koski.omadataoauth2.e2e.OmaDataOAuth2E2ESpec" --batch-mode + on_retry_command: npm run --prefix ./omadata-oauth2-sample/client clean-luovutuspalvelu-container - uses: actions/upload-artifact@v3 if: always() with: diff --git a/omadata-oauth2-sample/client/playwright.config.ts b/omadata-oauth2-sample/client/playwright.config.ts index eeec0d3d00a..9ecab28b693 100644 --- a/omadata-oauth2-sample/client/playwright.config.ts +++ b/omadata-oauth2-sample/client/playwright.config.ts @@ -96,7 +96,7 @@ export default defineConfig({ reuseExistingServer: !process.env.CI, stdout: "pipe", stderr: "pipe", - timeout: 10 * 60 * 1000, + timeout: 2 * 60 * 1000, }, { command: `npm run start`, @@ -104,7 +104,7 @@ export default defineConfig({ reuseExistingServer: !process.env.CI, stdout: "pipe", stderr: "pipe", - timeout: 10 * 60 * 1000, + timeout: 2 * 60 * 1000, }, ], })