From ce6cfecb869665fb132b2b95bce54465c6cb03a2 Mon Sep 17 00:00:00 2001 From: Sarah Sloan Date: Wed, 31 Jan 2024 12:34:44 +0000 Subject: [PATCH 1/2] updated workflow to take arguments about which e2e tests to execute --- .github/workflows/run-shared-tests.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-shared-tests.yml b/.github/workflows/run-shared-tests.yml index 09b53e87..fa3f4360 100644 --- a/.github/workflows/run-shared-tests.yml +++ b/.github/workflows/run-shared-tests.yml @@ -38,7 +38,11 @@ on: required: false default: false type: boolean - run_e2e_tests: + run_e2e_tests_application: + required: false + default: true + type: boolean + run_e2e_tests_assessment: required: false default: true type: boolean @@ -56,7 +60,7 @@ on: jobs: run_application_e2e_test: runs-on: ubuntu-latest - if: ${{ inputs.run_e2e_tests == true}} + if: ${{ inputs.run_e2e_tests_application == true}} defaults: run: working-directory: ./funding-service-design-e2e-checks @@ -101,7 +105,7 @@ jobs: run_assessment_e2e_test: runs-on: ubuntu-latest - if: ${{ inputs.run_e2e_tests == true}} + if: ${{ inputs.run_e2e_tests_assessment == true}} defaults: run: working-directory: ./funding-service-design-e2e-checks From 44b74f56012ad1166635d2378c098d3a8e107245 Mon Sep 17 00:00:00 2001 From: Sarah Sloan Date: Wed, 31 Jan 2024 12:38:31 +0000 Subject: [PATCH 2/2] updating post_Deploy accordingly --- .github/workflows/post-deploy.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/post-deploy.yml b/.github/workflows/post-deploy.yml index f5adc247..cd841c3c 100644 --- a/.github/workflows/post-deploy.yml +++ b/.github/workflows/post-deploy.yml @@ -18,6 +18,15 @@ on: required: false default: false type: boolean + run_e2e_tests_application: + required: false + default: true + type: boolean + run_e2e_tests_assessment: + required: false + default: true + type: boolean + # Leave this in for backwards compatibility, but remove once all repos updated to use above inputs run_e2e_tests: required: false default: false @@ -62,7 +71,8 @@ jobs: e2e_tests_target_url_assessment: https://fsd:fsd@assessment.${{ inputs.environment }}.access-funding.test.levellingup.gov.uk # run_performance_tests: ${{inputs.run_performance_tests}} run_performance_tests: false - run_e2e_tests: ${{inputs.run_e2e_tests}} + run_e2e_tests_assessment: ${{inputs.run_e2e_tests_assessment}} + run_e2e_tests_application: ${{inputs.run_e2e_tests_application}} secrets: FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }} FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}