diff --git a/.github/workflows/cron-e2e.yml b/.github/workflows/cron-e2e.yml index c7417caf2..271d40a91 100644 --- a/.github/workflows/cron-e2e.yml +++ b/.github/workflows/cron-e2e.yml @@ -11,8 +11,6 @@ jobs: with: browser: chrome secrets: - SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }} - SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD }} REPORT_PORTAL_URL: ${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_TOKEN: ${{ secrets.REPORT_PORTAL_TOKEN }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} @@ -28,8 +26,6 @@ jobs: with: browser: firefox secrets: - SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }} - SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD }} REPORT_PORTAL_URL: ${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_TOKEN: ${{ secrets.REPORT_PORTAL_TOKEN }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} @@ -45,8 +41,6 @@ jobs: with: browser: webkit secrets: - SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }} - SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD }} REPORT_PORTAL_URL: ${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_TOKEN: ${{ secrets.REPORT_PORTAL_TOKEN }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} @@ -62,8 +56,6 @@ jobs: with: browser: msedge secrets: - SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }} - SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD }} REPORT_PORTAL_URL: ${{ secrets.REPORT_PORTAL_URL }} REPORT_PORTAL_TOKEN: ${{ secrets.REPORT_PORTAL_TOKEN }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} diff --git a/.github/workflows/e2e-playwright-reusable.yml b/.github/workflows/e2e-playwright-reusable.yml index f6c94b67a..5bbf3bb94 100644 --- a/.github/workflows/e2e-playwright-reusable.yml +++ b/.github/workflows/e2e-playwright-reusable.yml @@ -7,10 +7,7 @@ on: required: true type: string secrets: - SCREENSHOT_USERNAME: - required: true - SCREENSHOT_PASSWORD: - required: true + REPORT_PORTAL_URL: required: true REPORT_PORTAL_TOKEN: @@ -30,8 +27,6 @@ env: ADMIN_PASSWORD: admin HR_USER: admin HR_USER_PASSWORD: admin - SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }} - SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD }} PLAYWRIGHT_E2E_HOST: http://localhost:4200 GH_BUILD_NUMBER: ${{ github.run_id }} REPORT_PORTAL_URL: ${{ secrets.REPORT_PORTAL_URL }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0c0818941..e931d859b 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -15,8 +15,6 @@ env: ADMIN_PASSWORD: admin HR_USER: admin HR_USER_PASSWORD: admin - SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }} - SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD}} PLAYWRIGHT_E2E_HOST: http://localhost:4200 GH_BUILD_NUMBER: ${{ github.run_id }} REPORT_PORTAL_URL: ${{ secrets.REPORT_PORTAL_URL }} diff --git a/.github/workflows/run-e2e-with-env.yml b/.github/workflows/run-e2e-with-env.yml index 81d463c37..c45a0d059 100644 --- a/.github/workflows/run-e2e-with-env.yml +++ b/.github/workflows/run-e2e-with-env.yml @@ -14,17 +14,12 @@ on: required: false default: 'http://localhost:4200' -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.url || secrets.PIPELINE_ENV_URL }}-${{ inputs.playwright_e2e_host || inputs.url || secrets.PLAYWRIGHT_E2E_HOST }} - cancel-in-progress: true env: BASE_URL: ${{ inputs.url || secrets.PIPELINE_ENV_URL }} ADMIN_EMAIL: ${{ secrets.PIPELINE_ADMIN_USERNAME }} ADMIN_PASSWORD: ${{ secrets.PIPELINE_ADMIN_PASSWORD }} - HR_USER: ${{ secrets.HR_USER }} - HR_USER_PASSWORD: ${{ secrets.HR_USER_PASSWORD }} - SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }} - SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD}} + HR_USER: hruser + HR_USER_PASSWORD: ${{ secrets.FRONTEND_TEST_USER_PASSWORD }} PLAYWRIGHT_E2E_HOST: ${{ inputs.playwright_e2e_host || inputs.url || secrets.PLAYWRIGHT_E2E_HOST }} GH_BUILD_NUMBER: ${{ github.run_id }} REPORT_PORTAL_URL: ${{ secrets.REPORT_PORTAL_URL }}