Merge branch 'main' into spike/Snapshot-tests

Author: will-larkin-nhs

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

@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 9ebaa0958ce826d44bdba77c25bf0a697e1f441c
+      ref: 093557aee9d7ffb803106db24f51b7a5ef6f7f50
       endpoint: NHSDigital
 
 variables:
@@ -29,9 +29,12 @@ stages:
     steps:
       - checkout: self
       - checkout: dtos-devops-templates
-      - template: .azuredevops/templates/steps/apply-database-changes.yaml@dtos-devops-templates
+      - template: .azuredevops/templates/steps/app-container-job-start.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
+          targetSubscriptionId: $(TF_VAR_TARGET_SUBSCRIPTION_ID)
+          resourceGroupName: $(RESOURCE_GROUP_NAME_SQL)
+          jobName: $(DATABASE_MANAGEMENT_JOB_NAME)
 
 - stage: re_tag_stage
   displayName: ACR re-tag

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

@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 9ebaa0958ce826d44bdba77c25bf0a697e1f441c
+      ref: 093557aee9d7ffb803106db24f51b7a5ef6f7f50
       endpoint: NHSDigital
 
 variables:
@@ -29,9 +29,12 @@ stages:
     steps:
       - checkout: self
       - checkout: dtos-devops-templates
-      - template: .azuredevops/templates/steps/apply-database-changes.yaml@dtos-devops-templates
+      - template: .azuredevops/templates/steps/app-container-job-start.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
+          targetSubscriptionId: $(TF_VAR_TARGET_SUBSCRIPTION_ID)
+          resourceGroupName: $(RESOURCE_GROUP_NAME_SQL)
+          jobName: $(DATABASE_MANAGEMENT_JOB_NAME)
 
 - stage: re_tag_stage
   displayName: ACR re-tag

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

@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 9ebaa0958ce826d44bdba77c25bf0a697e1f441c
+      ref: 093557aee9d7ffb803106db24f51b7a5ef6f7f50
       endpoint: NHSDigital
 
 variables:
@@ -29,9 +29,12 @@ stages:
     steps:
       - checkout: self
       - checkout: dtos-devops-templates
-      - template: .azuredevops/templates/steps/apply-database-changes.yaml@dtos-devops-templates
+      - template: .azuredevops/templates/steps/app-container-job-start.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
+          targetSubscriptionId: $(TF_VAR_TARGET_SUBSCRIPTION_ID)
+          resourceGroupName: $(RESOURCE_GROUP_NAME_SQL)
+          jobName: $(DATABASE_MANAGEMENT_JOB_NAME)
 
 - stage: deploy_image_stage
   displayName: Deploy images

…elines/acr-image-promote-to-devtest.yaml …elines/acr-image-promote-to-sandbox.yaml.azuredevops/pipelines/acr-image-promote-to-devtest.yaml renamed to .azuredevops/pipelines/acr-image-promote-to-sandbox.yaml .azuredevops/pipelines/acr-image-promote-to-devtest.yaml renamed to .azuredevops/pipelines/acr-image-promote-to-sandbox.yaml

@@ -9,7 +9,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 9ebaa0958ce826d44bdba77c25bf0a697e1f441c
+      ref: 093557aee9d7ffb803106db24f51b7a5ef6f7f50
       endpoint: NHSDigital
 
 variables:
@@ -24,14 +24,17 @@ stages:
       name: private-pool-dev-uks
     displayName: Apply database changes
     variables:
-      - group: DEVTEST_core_backend
-      - group: DEVTEST_image_pipelines
+      - group: SBX_core_backend
+      - group: SBX_image_pipelines
     steps:
       - checkout: self
       - checkout: dtos-devops-templates
-      - template: .azuredevops/templates/steps/apply-database-changes.yaml@dtos-devops-templates
+      - template: .azuredevops/templates/steps/app-container-job-start.yaml@dtos-devops-templates
         parameters:
           serviceConnection: $(SERVICE_CONNECTION)
+          targetSubscriptionId: $(TF_VAR_TARGET_SUBSCRIPTION_ID)
+          resourceGroupName: $(RESOURCE_GROUP_NAME_SQL)
+          jobName: $(DATABASE_MANAGEMENT_JOB_NAME)
 
 - stage: deploy_image_stage
   displayName: Deploy images
@@ -41,8 +44,8 @@ stages:
       name: private-pool-dev-uks
     displayName: Deploy Docker images to function apps
     variables:
-      - group: DEVTEST_core_backend
-      - group: DEVTEST_image_pipelines
+      - group: SBX_core_backend
+      - group: SBX_image_pipelines
     steps:
       - template: .azuredevops/templates/steps/deploy-images-from-acr.yaml@dtos-devops-templates
         parameters:
@@ -51,7 +54,7 @@ stages:
 - stage: post_deployment_tests_stage
   displayName: Post-deployment tests
   variables:
-  - group: DEVTEST_automation_testing_pipeline
+  - group: SBX_automation_testing_pipeline
   jobs:
   - job: post_deployment_tests
     displayName: Run post-deployment 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: c00889236a258a52a2f3131272427ce81d4da951
+      ref: 093557aee9d7ffb803106db24f51b7a5ef6f7f50
       endpoint: NHSDigital
 
 variables:

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

@@ -13,15 +13,15 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
+      ref: e4e68ea29c4fab7014caf900063fe70f785732f3
       endpoint: NHSDigital
 
 variables:
   - group: DEV_core_backend
   - group: DEV_audit_backend_remote_state
   - group: DEV_hub_backend_remote_state
   - name: TF_VERSION
-    value: 1.9.2
+    value: 1.11.4
   - name: TF_PLAN_ARTIFACT
     value: tf_plan_core_DEV
   - name: TF_DIRECTORY

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

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: c00889236a258a52a2f3131272427ce81d4da951
+      ref: 093557aee9d7ffb803106db24f51b7a5ef6f7f50
       endpoint: NHSDigital
 
 variables:

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

@@ -13,15 +13,15 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: 2f8731f9c7d6b9d53b7044979e381377b2c85bcd
+      ref: e4e68ea29c4fab7014caf900063fe70f785732f3
       endpoint: NHSDigital
 
 variables:
   - group: INT_core_backend
   - group: INT_audit_backend_remote_state
   - group: DEV_hub_backend_remote_state
   - name: TF_VERSION
-    value: 1.9.2
+    value: 1.11.4
   - name: TF_PLAN_ARTIFACT
     value: tf_plan_core_INT
   - name: TF_DIRECTORY