Merge branch 'main' into spike/Snapshot-tests

Author: will-larkin-nhs

.azuredevops/pipelines/acr-image-promote-dev-to-nft.yaml

@@ -9,21 +9,11 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: dbb933e78adea035c494a4d6c081c39787533a30
+      ref: 9ebaa0958ce826d44bdba77c25bf0a697e1f441c
       endpoint: NHSDigital
 
 variables:
   - group: DEV_hub_backend_remote_state
-  - name: sourceRegistry
-    value: acrukshubdevcohman
-  - name: selectImageTag
-    value: development
-  - name: destRegistry
-    value: acrukshubdevcohman
-  - name: addImageTag
-    value: nft
-  - name: destEnvironmentShortName
-    value: nft
 
 stages:
 - stage: db_changes_stage
@@ -35,20 +25,13 @@ stages:
     displayName: Apply database changes
     variables:
       - group: NFT_core_backend
+      - group: NFT_image_pipelines
     steps:
       - checkout: self
       - checkout: dtos-devops-templates
       - template: .azuredevops/templates/steps/apply-database-changes.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
-          resourceGroupSQL: rg-cohman-$(destEnvironmentShortName)-uks
-          miNameACR: dtos-cohort-manager-acr-push
-          miNameSQL: mi-cohort-manager-db-management-nft
-          acrServerName: '$(sourceRegistry).azurecr.io'
-          containerGroupName: 'acigrp-cohort-manager-db-migration'
-          containerName: 'cohort-manager-db-migration'
-          containerImageName: 'cohort-manager-database-db-migration:$(selectImageTag)'
-          sqlConnectionString: '$(DTOS_DATABASE_CONNECTION_STRING)'
 
 - stage: re_tag_stage
   displayName: ACR re-tag
@@ -58,14 +41,11 @@ stages:
       name: private-pool-prod-uks
     displayName: Update/copy Docker images with new tag
     variables:
-      SRC_REGISTRY: $(sourceRegistry)
-      DEST_REGISTRY: $(destRegistry)
-      SELECT_IMAGE_TAG: $(selectImageTag)
-      ADD_IMAGE_TAG: $(addImageTag)
+      - group: NFT_image_pipelines
     steps:
       - template: .azuredevops/templates/steps/acr-import-retag.yaml@dtos-devops-templates
         parameters:
-          serviceConnection: sc-cohort-manager-nft
+          serviceConnection: $(SERVICE_CONNECTION)
 
 - stage: deploy_image_stage
   displayName: Deploy images
@@ -75,15 +55,12 @@ stages:
       name: private-pool-dev-uks
     displayName: Deploy Docker images to function apps
     variables:
-      DEST_REGISTRY: $(destRegistry)
-      ADD_IMAGE_TAG: $(addImageTag)
-      FUNCTION_NAME_PREFIX: $(destEnvironmentShortName)-uks
-      FUNCTION_RESOURCE_GROUP: rg-cohort-manager-$(destEnvironmentShortName)-uks
-      PROJECT_NAME: cohort-manager
+      - group: NFT_core_backend
+      - group: NFT_image_pipelines
     steps:
       - template: .azuredevops/templates/steps/deploy-images-from-acr.yaml@dtos-devops-templates
         parameters:
-          serviceConnection: sc-cohort-manager-nft
+          serviceConnection: $(SERVICE_CONNECTION)
 
 - stage: post_deployment_tests_stage
   displayName: Post-deployment tests
@@ -94,14 +71,12 @@ stages:
     displayName: Run post-deployment tests
     pool:
       name: private-pool-dev-uks
-    variables:
-      AppSettings.ConnectionStrings.DtOsDatabaseConnectionString: $(DTOS_DATABASE_CONNECTION_STRING)
-      AppSettings.CloudFileStorageConnectionString: $(CAASFOLDER_STORAGE_CONNECTION_STRING)
-      AppSettings.ManagedIdentityClientId: $(MANAGED_IDENTITY_CLIENT_ID)
-      AppSettings.IsCloudEnvironment: $(Is_CloudEnvironment)
+
     steps:
-    - template: .azuredevops/templates/steps/run-post-deployment-tests.yaml@dtos-devops-templates
+    - template: .azuredevops/templates/steps/run-post-deployment-pw-tests.yaml@dtos-devops-templates
       parameters:
-        serviceConnection: sc-cohort-manager-nft
-        testProjectDirectory: 'tests/smoke-tests/NHS.CohortManager.SmokeTests'
-        testProjectName: 'NHS.CohortManager.SmokeTests'
+        serviceConnection: $(SERVICE_CONNECTION)
+        testProjectDirectory: 'tests/playwright-tests'
+        testfileDirectory: 'src/tests/e2e/testFiles'
+        testProjectName: 'tests'
+

.azuredevops/pipelines/acr-image-promote-nft-to-integration.yaml

@@ -9,21 +9,11 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: dbb933e78adea035c494a4d6c081c39787533a30
+      ref: 9ebaa0958ce826d44bdba77c25bf0a697e1f441c
       endpoint: NHSDigital
 
 variables:
   - group: DEV_hub_backend_remote_state
-  - name: sourceRegistry
-    value: acrukshubdevcohman
-  - name: selectImageTag
-    value: nft
-  - name: destRegistry
-    value: acrukshubdevcohman
-  - name: addImageTag
-    value: integration
-  - name: destEnvironmentShortName
-    value: int
 
 stages:
 - stage: db_changes_stage
@@ -35,20 +25,13 @@ stages:
     displayName: Apply database changes
     variables:
       - group: INT_core_backend
+      - group: INT_image_pipelines
     steps:
       - checkout: self
       - checkout: dtos-devops-templates
       - template: .azuredevops/templates/steps/apply-database-changes.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
-          resourceGroupSQL: rg-cohman-$(destEnvironmentShortName)-uks
-          miNameACR: dtos-cohort-manager-acr-push
-          miNameSQL: mi-cohort-manager-db-management-int
-          acrServerName: '$(sourceRegistry).azurecr.io'
-          containerGroupName: 'acigrp-cohort-manager-db-migration'
-          containerName: 'cohort-manager-db-migration'
-          containerImageName: 'cohort-manager-database-db-migration:$(selectImageTag)'
-          sqlConnectionString: '$(DTOS_DATABASE_CONNECTION_STRING)'
 
 - stage: re_tag_stage
   displayName: ACR re-tag
@@ -58,10 +41,7 @@ stages:
       name: private-pool-prod-uks
     displayName: Update/copy Docker images with new tag
     variables:
-      SRC_REGISTRY: $(sourceRegistry)
-      DEST_REGISTRY: $(destRegistry)
-      SELECT_IMAGE_TAG: $(selectImageTag)
-      ADD_IMAGE_TAG: $(addImageTag)
+      - group: INT_image_pipelines
     steps:
       - template: .azuredevops/templates/steps/acr-import-retag.yaml@dtos-devops-templates
         parameters:
@@ -75,11 +55,8 @@ stages:
       name: private-pool-dev-uks
     displayName: Deploy Docker images to function apps
     variables:
-      DEST_REGISTRY: $(destRegistry)
-      ADD_IMAGE_TAG: $(addImageTag)
-      FUNCTION_NAME_PREFIX: $(destEnvironmentShortName)-uks
-      FUNCTION_RESOURCE_GROUP: rg-cohort-manager-$(destEnvironmentShortName)-uks
-      PROJECT_NAME: cohort-manager
+      - group: INT_core_backend
+      - group: INT_image_pipelines
     steps:
       - template: .azuredevops/templates/steps/deploy-images-from-acr.yaml@dtos-devops-templates
         parameters:
@@ -94,14 +71,12 @@ stages:
     displayName: Run post-deployment tests
     pool:
       name: private-pool-dev-uks
-    variables:
-      AppSettings.ConnectionStrings.DtOsDatabaseConnectionString: $(DTOS_DATABASE_CONNECTION_STRING)
-      AppSettings.CloudFileStorageConnectionString: $(CAASFOLDER_STORAGE_CONNECTION_STRING)
-      AppSettings.ManagedIdentityClientId: $(MANAGED_IDENTITY_CLIENT_ID)
-      AppSettings.IsCloudEnvironment: $(Is_CloudEnvironment)
+
     steps:
-    - template: .azuredevops/templates/steps/run-post-deployment-tests.yaml@dtos-devops-templates
+    - template: .azuredevops/templates/steps/run-post-deployment-pw-tests.yaml@dtos-devops-templates
       parameters:
         serviceConnection: $(SERVICE_CONNECTION)
-        testProjectDirectory: 'tests/smoke-tests/NHS.CohortManager.SmokeTests'
-        testProjectName: 'NHS.CohortManager.SmokeTests'
+        testProjectDirectory: 'tests/playwright-tests'
+        testfileDirectory: 'src/tests/e2e/testFiles'
+        testProjectName: 'tests'
+

.azuredevops/pipelines/acr-image-promote-to-dev.yaml

@@ -9,17 +9,11 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: dbb933e78adea035c494a4d6c081c39787533a30
+      ref: 9ebaa0958ce826d44bdba77c25bf0a697e1f441c
       endpoint: NHSDigital
 
 variables:
   - group: DEV_hub_backend_remote_state
-  - name: sourceRegistry
-    value: acrukshubdevcohman
-  - name: selectImageTag
-    value: development
-  - name: destEnvironmentShortName
-    value: dev
 
 stages:
 - stage: db_changes_stage
@@ -31,20 +25,13 @@ stages:
     displayName: Apply database changes
     variables:
       - group: DEV_core_backend
+      - group: DEV_image_pipelines
     steps:
       - checkout: self
       - checkout: dtos-devops-templates
       - template: .azuredevops/templates/steps/apply-database-changes.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
-          resourceGroupSQL: rg-cohman-$(destEnvironmentShortName)-uks
-          miNameACR: dtos-cohort-manager-acr-push
-          miNameSQL: mi-cohort-manager-db-management-dev
-          acrServerName: '$(sourceRegistry).azurecr.io'
-          containerGroupName: 'acigrp-cohman-$(destEnvironmentShortName)-uks-db-migration'
-          containerName: 'cohort-manager-db-migration'
-          containerImageName: 'cohort-manager-database-db-migration:$(selectImageTag)'
-          sqlConnectionString: '$(DTOS_DATABASE_CONNECTION_STRING)'
 
 - stage: deploy_image_stage
   displayName: Deploy images
@@ -54,11 +41,8 @@ stages:
       name: private-pool-dev-uks
     displayName: Deploy Docker images to function apps
     variables:
-      DEST_REGISTRY: $(destRegistry)
-      ADD_IMAGE_TAG: $(addImageTag)
-      FUNCTION_NAME_PREFIX: $(destEnvironmentShortName)-uks
-      FUNCTION_RESOURCE_GROUP: rg-cohort-manager-$(destEnvironmentShortName)-uks
-      PROJECT_NAME: cohort-manager
+      - group: DEV_core_backend
+      - group: DEV_image_pipelines
     steps:
       - template: .azuredevops/templates/steps/deploy-images-from-acr.yaml@dtos-devops-templates
         parameters:
@@ -73,14 +57,12 @@ stages:
     displayName: Run post-deployment tests
     pool:
       name: private-pool-dev-uks
-    variables:
-      AppSettings.ConnectionStrings.DtOsDatabaseConnectionString: $(DTOS_DATABASE_CONNECTION_STRING)
-      AppSettings.CloudFileStorageConnectionString: $(CAASFOLDER_STORAGE_CONNECTION_STRING)
-      AppSettings.ManagedIdentityClientId: $(MANAGED_IDENTITY_CLIENT_ID)
-      AppSettings.IsCloudEnvironment: $(Is_CloudEnvironment)
+
     steps:
-    - template: .azuredevops/templates/steps/run-post-deployment-tests.yaml@dtos-devops-templates
+    - template: .azuredevops/templates/steps/run-post-deployment-pw-tests.yaml@dtos-devops-templates
       parameters:
         serviceConnection: $(SERVICE_CONNECTION)
-        testProjectDirectory: 'tests/smoke-tests/NHS.CohortManager.SmokeTests'
-        testProjectName: 'NHS.CohortManager.SmokeTests'
+        testProjectDirectory: 'tests/playwright-tests'
+        testfileDirectory: 'src/tests/e2e/testFiles'
+        testProjectName: 'tests'
+

.azuredevops/pipelines/acr-image-promote-to-devtest.yaml

@@ -9,17 +9,11 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: dbb933e78adea035c494a4d6c081c39787533a30
+      ref: 9ebaa0958ce826d44bdba77c25bf0a697e1f441c
       endpoint: NHSDigital
 
 variables:
   - group: DEV_hub_backend_remote_state
-  - name: sourceRegistry
-    value: acrukshubdevcohman
-  - name: selectImageTag
-    value: development
-  - name: destEnvironmentShortName
-    value: devtest
 
 stages:
 - stage: db_changes_stage
@@ -31,20 +25,13 @@ stages:
     displayName: Apply database changes
     variables:
       - group: DEVTEST_core_backend
+      - group: DEVTEST_image_pipelines
     steps:
       - checkout: self
       - checkout: dtos-devops-templates
       - template: .azuredevops/templates/steps/apply-database-changes.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
-          resourceGroupSQL: rg-cohman-$(destEnvironmentShortName)-uks
-          miNameACR: dtos-cohort-manager-acr-push
-          miNameSQL: mi-cohort-manager-db-management-devtest
-          acrServerName: '$(sourceRegistry).azurecr.io'
-          containerGroupName: 'acigrp-cohman-$(destEnvironmentShortName)-uks-db-migration'
-          containerName: 'cohort-manager-db-migration'
-          containerImageName: 'cohort-manager-database-db-migration:$(selectImageTag)'
-          sqlConnectionString: '$(DTOS_DATABASE_CONNECTION_STRING)'
 
 - stage: deploy_image_stage
   displayName: Deploy images
@@ -54,12 +41,27 @@ stages:
       name: private-pool-dev-uks
     displayName: Deploy Docker images to function apps
     variables:
-      DEST_REGISTRY: $(destRegistry)
-      ADD_IMAGE_TAG: $(addImageTag)
-      FUNCTION_NAME_PREFIX: $(destEnvironmentShortName)-uks
-      FUNCTION_RESOURCE_GROUP: rg-cohort-manager-$(destEnvironmentShortName)-uks
-      PROJECT_NAME: cohort-manager
+      - group: DEVTEST_core_backend
+      - group: DEVTEST_image_pipelines
     steps:
       - template: .azuredevops/templates/steps/deploy-images-from-acr.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
+
+- stage: post_deployment_tests_stage
+  displayName: Post-deployment tests
+  variables:
+  - group: DEVTEST_automation_testing_pipeline
+  jobs:
+  - job: post_deployment_tests
+    displayName: Run post-deployment tests
+    pool:
+      name: private-pool-dev-uks
+
+    steps:
+    - template: .azuredevops/templates/steps/run-post-deployment-pw-tests.yaml@dtos-devops-templates
+      parameters:
+        serviceConnection: $(SERVICE_CONNECTION)
+        testProjectDirectory: 'tests/playwright-tests'
+        testfileDirectory: 'src/tests/e2e/testFiles'
+        testProjectName: 'tests'

.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
+      ref: c00889236a258a52a2f3131272427ce81d4da951
       endpoint: NHSDigital
 
 variables:
@@ -22,7 +22,7 @@ variables:
   - name: TF_DIRECTORY
     value: $(System.DefaultWorkingDirectory)/$(System.TeamProject)/infrastructure/tf-audit
   - name: TF_VERSION
-    value: 1.9.2
+    value: 1.11.4
   - name: TF_PLAN_ARTIFACT
     value: tf_plan_audit_DEV
   - name: ENVIRONMENT

.azuredevops/pipelines/cd-infrastructure-devtest-audit.yaml

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
+      ref: c00889236a258a52a2f3131272427ce81d4da951
       endpoint: NHSDigital
 
 variables:
@@ -22,7 +22,7 @@ variables:
   - name: TF_DIRECTORY
     value: $(System.DefaultWorkingDirectory)/$(System.TeamProject)/infrastructure/tf-audit
   - name: TF_VERSION
-    value: 1.9.2
+    value: 1.11.4
   - name: TF_PLAN_ARTIFACT
     value: tf_plan_audit_DEVTEST
   - name: ENVIRONMENT

.azuredevops/pipelines/cd-infrastructure-int-audit.yaml

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
+      ref: c00889236a258a52a2f3131272427ce81d4da951
       endpoint: NHSDigital
 
 variables:
@@ -22,7 +22,7 @@ variables:
   - name: TF_DIRECTORY
     value: $(System.DefaultWorkingDirectory)/$(System.TeamProject)/infrastructure/tf-audit
   - name: TF_VERSION
-    value: 1.9.2
+    value: 1.11.4
   - name: TF_PLAN_ARTIFACT
     value: tf_plan_audit_INT
   - name: ENVIRONMENT