MAN-227 - enable tests and general tidy up

ministryofjustice · Dec 20, 2024 · dff0c5e · dff0c5e
1 parent ebd24d3
commit dff0c5e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 30 deletions.
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -67,22 +67,5 @@ jobs:
           additional_docker_tag: ${{ secrets.SENTRY_AUTH_TOKEN }}
           push: ${{ inputs.push }}
           app_version: ${{ steps.app_version.outputs.version }}
-#      - uses: docker/build-push-action@v6
-#        with:
-#          cache-from: type=gha
-#          platforms: linux/amd64,linux/arm64
-#          cache-to: type=gha,mode=max
-#          context: .
-#          push: ${{ inputs.push }}
-#          secret-envs: |
-#            "sentry=SENTRY_AUTH_TOKEN"
-#          provenance: false
-#          build-args: |
-#            "BUILD_NUMBER=${{ steps.app_version.outputs.version }}
-#            "GIT_REF=${{ github.sha }}"
-#            "GIT_BRANCH=${{ github.ref_name }}"
-#          tags: |
-#            ${{ inputs.docker_registry}}/${{ inputs.registry_org }}/${{ github.event.repository.name }}:latest
-#            ${{ inputs.docker_registry}}/${{ inputs.registry_org }}/${{ github.event.repository.name }}:${{ steps.app_version.outputs.version }}
 
 
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -37,17 +37,17 @@ jobs:
     uses: ./.github/workflows/node_build.yml # WORKFLOW_VERSION
     secrets: inherit
   # generic node unit tests - feel free to override with local tests if required
-#  node_unit_tests:
-#    name: node unit tests
-#    uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_unit_tests.yml@v2 # WORKFLOW_VERSION
-#    needs: [node_build]
-#    secrets: inherit
+  node_unit_tests:
+    name: node unit tests
+    uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_unit_tests.yml@v2 # WORKFLOW_VERSION
+    needs: [node_build]
+    secrets: inherit
   # generic node integration tests using wiremock - feel free to override with local tests if required
-#  node_integration_tests:
-#    name: node integration tests
-#    uses: ./.github/workflows/node_integration_tests.yml # WORKFLOW_VERSION
-#    needs: [node_build]
-#    secrets: inherit
+  node_integration_tests:
+    name: node integration tests
+    uses: ./.github/workflows/node_integration_tests.yml # WORKFLOW_VERSION
+    needs: [node_build]
+    secrets: inherit
   helm_lint:
     strategy:
       matrix:
@@ -62,9 +62,9 @@ jobs:
 #    if: github.ref == 'refs/heads/main'
     uses: ./.github/workflows/docker_build.yml # WORKFLOW_VERSION
     secrets: inherit
-#    needs:
-#      - node_integration_tests
-#      - node_unit_tests
+    needs:
+      - node_integration_tests
+      - node_unit_tests
     with:
       docker_registry: 'ghcr.io'
       registry_org: 'ministryofjustice'