Merge branch 'main' into feat/DTOSS-7718-end-to-end-tests

Author: SamRobinson75684

.azuredevops/pipelines/post-deployment-tests-dev.yaml

@@ -4,7 +4,7 @@ trigger: none
 pr: none
 
 schedules:
-  - cron: "15 7 * * 1-5" # Every weekday (Mon-Fri) at 07:15 UTC i.e 8:15 BST
+  - cron: "00 5 * * 1-5" # Every weekday (Mon-Fri) at 05:00 UTC i.e 06:00 BST
     displayName: Weekdays run
     branches:
       include:
@@ -16,7 +16,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 variables:

.azuredevops/pipelines/task_azure_sql_scaling_dev.yaml

@@ -8,7 +8,7 @@ pool:
   name: private-pool-dev-uks
 
 schedules:
-  - cron: "0 7 * * *" # Run at 7:00 AM UTC
+  - cron: "45 4 * * *" # Run at 04:45 AM UTC
     displayName: 'Scale_Peak'
     branches:
       include:
@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 parameters:

.azuredevops/pipelines/task_azure_sql_scaling_int.yaml

@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 parameters:

.azuredevops/pipelines/task_azure_sql_scaling_nft.yaml

@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 parameters:

.azuredevops/pipelines/task_azure_sql_scaling_preprod.yaml

@@ -27,7 +27,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d6d6e3e99459d9d71a83fa5affa900a6c339a3b5
+      ref: 143bb43a2f95dd23e3c579a3bf87b29a63ee4003
       endpoint: NHSDigital
 
 parameters:

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

@@ -156,7 +156,7 @@ jobs:
       contents: read
     uses: ./.github/workflows/stage-4-deploy.yaml
     with:
-      environments: "[\"sandbox\"]"
+      environments: "[\"development\"]"
       commit_sha: ${{ github.sha }}
     secrets: inherit
   validate-title-stage:

.github/workflows/stage-4-deploy.yaml

@@ -66,12 +66,12 @@ jobs:
 
           # Define which tests to run based on the environment
           declare -A test_types=(
-            ["dev"]="smoke_e2e,regression_api,regression_e2e_epic1,regression_e2e_epic2,regression_e2e_epic3"
-            ["nft"]="smoke_e2e,regression_api,regression_e2e_epic1,regression_e2e_epic2,regression_e2e_epic3"
-            ["int"]=""
+            ["development"]="smoke_e2e"
+            ["nft"]=""
+            ["integration"]=""
             ["sandbox"]="smoke_e2e,regression_api"
-            ["pre"]=""
-            ["prod"]=""
+            ["preprod"]=""
+            ["production"]=""
           )
 
           git_short_sha=$(git rev-parse --short ${{inputs.commit_sha}})

infrastructure/tf-core/environments/nft.tfvars

@@ -1163,6 +1163,7 @@ linux_web_app = {
           AUTH_TRUST_HOST      = "true"
           NEXTAUTH_URL         = "https://cohort-nft.non-live.screening.nhs.uk/api/auth"
           SERVICE_NAME         = "Cohort Manager"
+          APP_ENV              = "development"
         }
         from_key_vault = {
           # env_var_name           = "key_vault_secret_name"