Merge pull request #356 from NHSDigital/develop

APIM-R 1.10

Author: nhsd-david-wass

.github/dependabot.yml

@@ -0,0 +1,62 @@
+version: 2
+updates:
+    - package-ecosystem: "npm"
+      directory: "/"
+      schedule:
+          interval: "daily"
+      allow:
+          - dependency-type: "all"
+      target-branch: "develop"
+      commit-message:
+          prefix: "npm"
+          include: "scope"
+
+    - package-ecosystem: "npm"
+      directory: "/sandbox"
+      schedule:
+          interval: "daily"
+      allow:
+          -   dependency-type: "all"
+      target-branch: "develop"
+      commit-message:
+          prefix: "sandbox-npm"
+          include: "scope"
+
+    - package-ecosystem: "pip"
+      directory: "/"
+      schedule:
+          interval: "daily"
+      allow:
+          - dependency-type: "all"
+      target-branch: "develop"
+      commit-message:
+          prefix: "pip"
+          include: "scope"
+
+    - package-ecosystem: "docker"
+      directory: "/sandbox"
+      schedule:
+          interval: "daily"
+      allow:
+          - dependency-type: "all"
+      target-branch: "develop"
+      commit-message:
+          prefix: "sandbox-docker"
+          include: "scope"
+
+    - package-ecosystem: "github-actions"
+      directory: "/"
+      schedule:
+          interval: "daily"
+      allow:
+          - dependency-type: "all"
+      target-branch: "develop"
+      commit-message:
+          prefix: "github-actions"
+          include: "scope"
+
+
+
+
+
+

.gitignore

@@ -20,6 +20,7 @@ __pycache__/
 
 tests/test-report.xml
 tests/functional-test-report.xml
+tests/sandbox-test-report.xml
 .orig
 
 .python-version

azure/azure-pr-pipeline.yml

@@ -86,4 +86,5 @@ extends:
         post_deploy:
         - template: templates/run-tests.yml
           parameters:
+            smoke_tests: true
             sandbox_tests: true

azure/azure-release-pipeline.yml

@@ -126,7 +126,15 @@ extends:
       proxy_path: sandbox
       depends_on:
       - manual_approval_sa
+      post_deploy:
+      - template: templates/run-tests.yml
+        parameters:
+          smoke_tests: true
     - environment: sandbox
       proxy_path: sandbox
       depends_on:
       - manual_approval_int
+      post_deploy:
+      - template: templates/run-tests.yml
+        parameters:
+          smoke_tests: true

azure/templates/ers-sandbox-tests.yml

@@ -1,5 +1,5 @@
 steps:
-  - bash: |
+  - bash: |      
       poetry run pytest -v tests/sandbox --junitxml=tests/sandbox-test-report.xml
     displayName: Run Sandbox tests
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)"

ecs-proxies-deploy.yml

@@ -3,4 +3,4 @@ docker_service:
     expose: true
     health_check:
       matcher: "200"
-      path: "/_health"
+      path: "/_ping"