BAU move just run tests to split app and assessment

communitiesuk · Feb 6, 2024 · 28bc6a8 · 28bc6a8
1 parent 0ab581c
commit 28bc6a8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/just-run-tests.yml b/.github/workflows/just-run-tests.yml
@@ -19,11 +19,16 @@ on:
         default: false
         type: boolean
         description: Run performance tests
-      run_e2e_tests:
+      run_e2e_tests_application:
         required: false
         default: true
         type: boolean
-        description: Run e2e tests
+        description: Run e2e tests (application)
+      run_e2e_tests_assessment:
+        required: false
+        default: true
+        type: boolean
+        description: Run e2e tests (assessment)
 jobs:
   run_shared_tests_dev:
     if: ${{ always() && inputs.dev == true }}
@@ -37,7 +42,9 @@ jobs:
       e2e_tests_target_url_form_runner: https://forms.dev.access-funding.test.levellingup.gov.uk
       e2e_tests_target_url_assessment: https://assessment.dev.access-funding.test.levellingup.gov.uk
       run_performance_tests: ${{inputs.run_performance_tests}}
-      run_e2e_tests: ${{inputs.run_e2e_tests}}
+      run_e2e_tests_aplication: ${{inputs.run_e2e_tests_aplication}}
+      run_e2e_tests_assessment: ${{inputs.run_e2e_tests_assessment}}
+    secrets:
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
       FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}
@@ -54,7 +61,8 @@ jobs:
       e2e_tests_target_url_form_runner: https://forms.test.access-funding.test.levellingup.gov.uk
       e2e_tests_target_url_assessment: https://assessment.test.access-funding.test.levellingup.gov.uk
       run_performance_tests: ${{inputs.run_performance_tests}}
-      run_e2e_tests: ${{inputs.run_e2e_tests}}
+      run_e2e_tests_aplication: ${{inputs.run_e2e_tests_aplication}}
+      run_e2e_tests_assessment: ${{inputs.run_e2e_tests_assessment}}
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
       FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}
@@ -70,7 +78,8 @@ jobs:
       e2e_tests_target_url_form_runner: https://forms.uat.access-funding.test.levellingup.gov.uk
       e2e_tests_target_url_assessment: https://assessment.uat.access-funding.test.levellingup.gov.uk
       run_performance_tests: ${{inputs.run_performance_tests}}
-      run_e2e_tests: ${{inputs.run_e2e_tests}}
+      run_e2e_tests_aplication: ${{inputs.run_e2e_tests_aplication}}
+      run_e2e_tests_assessment: ${{inputs.run_e2e_tests_assessment}}
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
-      FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}
+      FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}
diff --git a/.github/workflows/post-deploy.yml b/.github/workflows/post-deploy.yml
@@ -26,11 +26,6 @@ on:
         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
-        type: boolean
       run_static_security_python:
         required: false
         default: true