Bump non prod to S1

- preprod is S1 and is worked so trying with dev and test - Fix sleep message issue - increase curl connect timeout to 10 min
DFE-Digital · Sep 17, 2024 · 531fea8 · 531fea8
1 parent bd0107c
commit 531fea8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/actions/deploy-environment/action.yml b/.github/actions/deploy-environment/action.yml
@@ -162,7 +162,7 @@ runs:
         max_attempts=$RETRIES
 
         HEALTH_URL="${{ env.app_fqdn }}/health/all.json"
-        HEALTH_RESPONSE=$(curl $HEALTH_URL --silent)
+        HEALTH_RESPONSE=$(curl $HEALTH_URL --silent --connect-timeout 600)
         APP_SHA=$(echo $HEALTH_RESPONSE | jq -R '. as $line | try (fromjson | .version.message) catch $line' | grep -Po "Version: \K\w*")
         APP_STATUS=$(echo $HEALTH_RESPONSE | jq -R '. as $line | try (fromjson | .default.success) catch $line')
         APP_DATABASE_STATUS=$(echo $HEALTH_RESPONSE | jq -R '. as $line | try (fromjson | .database.success) catch $line')
@@ -176,7 +176,7 @@ runs:
           sleep 5
           attempt_counter=$(($attempt_counter+1))
 
-          HEALTH_RESPONSE=$(curl $HEALTH_URL --silent)
+          HEALTH_RESPONSE=$(curl $HEALTH_URL --silent --connect-timeout 600)
           APP_SHA=$(echo $HEALTH_RESPONSE | jq -R '. as $line | try (fromjson | .version.message) catch $line' | grep -Po "Version: \K\w*")
           APP_STATUS=$(echo $HEALTH_RESPONSE | jq -R '. as $line | try (fromjson | .default.success) catch $line')
           APP_DATABASE_STATUS=$(echo $HEALTH_RESPONSE | jq -R '. as $line | try (fromjson | .database.success) catch $line')

diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -162,7 +162,7 @@ jobs:
       - run: |
           echo Sleeping...
           sleep 600
-          Finished sleeping
+          echo Finished sleeping
 
       - uses: ./.github/actions/smoke-test
         id: smoke-test

diff --git a/terraform/workspace_variables/dev.tfvars.json b/terraform/workspace_variables/dev.tfvars.json
@@ -3,6 +3,7 @@
   "key_vault_name": "s165d01-aytq-dv-kv",
   "resource_group_name": "s165d01-aytq-dv-rg",
   "storage_account_name": "s165d01aytqtfstatedv",
+  "app_service_plan_sku": "S1",
   "keyvault_logging_enabled": true,
   "storage_log_categories": [],
   "resource_prefix": "s165d01-aytq",

diff --git a/terraform/workspace_variables/test.tfvars.json b/terraform/workspace_variables/test.tfvars.json
@@ -3,7 +3,7 @@
   "key_vault_name": "s165t01-aytq-ts-kv",
   "resource_group_name": "s165t01-aytq-ts-rg",
   "storage_account_name": "s165t01aytqtfstatets",
-  "app_service_plan_sku": "B2",
+  "app_service_plan_sku": "S1",
   "keyvault_logging_enabled": true,
   "storage_log_categories": [],
   "resource_prefix": "s165t01-aytq",