Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20230-compartment-4-utils

Author: adrianoaru-nhs

.github/actions/run-playwright-tests/action.yml

@@ -0,0 +1,36 @@
+name: "Run Util & Example Tests"
+runs-on: ubuntu-latest
+timeout-minutes: 3
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+    - name: Install dependencies
+      shell: bash
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Ensure browsers are installed
+      shell: bash
+      run: python -m playwright install --with-deps
+    - name: Run util tests
+      shell: bash
+      run: pytest -m "utils" --ignore=tests/
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: result-output-utils
+        path: test-results/
+        retention-days: 3
+    - name: Run example tests
+      shell: bash
+      run: pytest --ignore=tests_utils/
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: result-output-example
+        path: test-results/
+        retention-days: 3

.github/actions/run-util-tests/action.yml

@@ -0,0 +1,25 @@
+name: "Run Util Tests"
+runs-on: ubuntu-latest
+timeout-minutes: 3
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+    - name: Install dependencies
+      shell: bash
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Run util tests
+      shell: bash
+      run: pytest -m "utils" --ignore=tests/
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: result-output-utils
+        path: test-results/
+        retention-days: 3
+

.github/workflows/cicd-1-pull-request.yaml

@@ -87,29 +87,3 @@ jobs:
       python_version: "${{ needs.metadata.outputs.python_version }}"
       version: "${{ needs.metadata.outputs.version }}"
     secrets: inherit
-  build-stage: # Recommended maximum execution time is 3 minutes
-    name: "Build & Assurance stage"
-    needs: [metadata, test-stage]
-    uses: ./.github/workflows/stage-3-build.yaml
-    if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
-    with:
-      build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
-      build_timestamp: "${{ needs.metadata.outputs.build_timestamp }}"
-      build_epoch: "${{ needs.metadata.outputs.build_epoch }}"
-      nodejs_version: "${{ needs.metadata.outputs.nodejs_version }}"
-      python_version: "${{ needs.metadata.outputs.python_version }}"
-      version: "${{ needs.metadata.outputs.version }}"
-    secrets: inherit
-  # acceptance-stage: # Recommended maximum execution time is 10 minutes
-  #   name: "Acceptance stage"
-  #   needs: [metadata, build-stage]
-  #   uses: ./.github/workflows/stage-4-acceptance.yaml
-  #   if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
-  #   with:
-  #     build_datetime: "${{ needs.metadata.outputs.build_datetime }}"
-  #     build_timestamp: "${{ needs.metadata.outputs.build_timestamp }}"
-  #     build_epoch: "${{ needs.metadata.outputs.build_epoch }}"
-  #     nodejs_version: "${{ needs.metadata.outputs.nodejs_version }}"
-  #     python_version: "${{ needs.metadata.outputs.python_version }}"
-  #     version: "${{ needs.metadata.outputs.version }}"
-  #   secrets: inherit

.github/workflows/cicd-2-publish.yaml

@@ -29,62 +29,12 @@ on:
         type: string
 
 jobs:
-  test-unit:
-    name: "Unit tests"
+  run-tests:
+    name: "Run Util Tests"
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 3
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v4
-      - name: "Run unit test suite"
-        run: |
-          make test-unit
-      - name: "Save the result of fast test suite"
-        run: |
-          echo "Nothing to save"
-  test-lint:
-    name: "Linting"
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
-      - name: "Run linting"
-        run: |
-          make test-lint
-      - name: "Save the linting result"
-        run: |
-          echo "Nothing to save"
-  test-coverage:
-    name: "Test coverage"
-    needs: [test-unit]
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
-      - name: "Run test coverage check"
-        run: |
-          make test-coverage
-      - name: "Save the coverage check result"
-        run: |
-          echo "Nothing to save"
-  perform-static-analysis:
-    name: "Perform static analysis"
-    needs: [test-unit]
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-    timeout-minutes: 5
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Full history is needed to improving relevancy of reporting
-      - name: "Perform static analysis"
-        uses: ./.github/actions/perform-static-analysis
-        with:
-          sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
-          sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"
-          sonar_token: "${{ secrets.SONAR_TOKEN }}"
+      - name: "Run Util Tests"
+        uses: ./.github/actions/run-util-tests