From b699e24e1920b04b5914ef96d10feb41081f5738 Mon Sep 17 00:00:00 2001 From: marcogagliardi Date: Mon, 18 Sep 2023 10:26:18 +0100 Subject: [PATCH 1/3] Update appsettings.json --- AdminWebsite/AdminWebsite/appsettings.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/AdminWebsite/AdminWebsite/appsettings.json b/AdminWebsite/AdminWebsite/appsettings.json index 18b964435..c1c1fe28c 100644 --- a/AdminWebsite/AdminWebsite/appsettings.json +++ b/AdminWebsite/AdminWebsite/appsettings.json @@ -22,5 +22,8 @@ "PostLogoutRedirectUri": "https://localhost:5400/logout" }, "AllowedHosts": "*", - "APIFailureRetryTimeoutSeconds": 60 + "APIFailureRetryTimeoutSeconds": 60, + "VhServices" : { + "BookingsApiUrl": "https://vh-bookings-api-pr-721.dev.platform.hmcts.net" + } } From 6ef03503f7d34205ab2e0fa84d21c08f06cc0c06 Mon Sep 17 00:00:00 2001 From: marcogagliardi Date: Mon, 18 Sep 2023 12:39:45 +0100 Subject: [PATCH 2/3] update settings for testing --- AdminWebsite/AdminWebsite/appsettings.json | 5 +---- charts/vh-admin-web/values.dev.template.yaml | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/AdminWebsite/AdminWebsite/appsettings.json b/AdminWebsite/AdminWebsite/appsettings.json index c1c1fe28c..18b964435 100644 --- a/AdminWebsite/AdminWebsite/appsettings.json +++ b/AdminWebsite/AdminWebsite/appsettings.json @@ -22,8 +22,5 @@ "PostLogoutRedirectUri": "https://localhost:5400/logout" }, "AllowedHosts": "*", - "APIFailureRetryTimeoutSeconds": 60, - "VhServices" : { - "BookingsApiUrl": "https://vh-bookings-api-pr-721.dev.platform.hmcts.net" - } + "APIFailureRetryTimeoutSeconds": 60 } diff --git a/charts/vh-admin-web/values.dev.template.yaml b/charts/vh-admin-web/values.dev.template.yaml index 119a08454..dec420286 100644 --- a/charts/vh-admin-web/values.dev.template.yaml +++ b/charts/vh-admin-web/values.dev.template.yaml @@ -10,3 +10,4 @@ java: DOM1__POSTLOGOUTREDIRECTURI: https://${SERVICE_FQDN}/logout DOM1__REDIRECTURI: https://${SERVICE_FQDN}/home DOM1__REDIRECTURI: https://${SERVICE_FQDN}/home + VHSERVICES__BOOKINGSAPIURL: https://vh-bookings-api-pr-722.dev.platform.hmcts.net/ From b7d799ebf40a3677294ca2e37bfa6675e644f9ac Mon Sep 17 00:00:00 2001 From: marcogagliardi Date: Fri, 29 Sep 2023 10:01:40 +0100 Subject: [PATCH 3/3] Update azure-pipelines.sds.pr-release.yml --- azure-pipelines.sds.pr-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.sds.pr-release.yml b/azure-pipelines.sds.pr-release.yml index 9842eab77..ad2a13fd1 100644 --- a/azure-pipelines.sds.pr-release.yml +++ b/azure-pipelines.sds.pr-release.yml @@ -39,6 +39,7 @@ stages: parameters: chartPath: ${{ variables.chartPath }} chartValuesPath: ${{ variables.chartPath }} + helmVersion: '3.12.3' - job: UnitAndIntegrationTests displayName: "Unit and Integration Tests"