From baf124f0630d5bfae11529f2dbb23af380ab0a05 Mon Sep 17 00:00:00 2001 From: manukundloo-hmcts Date: Tue, 16 May 2023 14:48:33 +0100 Subject: [PATCH 1/2] [RDCC-6200] Fix for delete functional test user --- Jenkinsfile_nightly | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index b9d30e91c..77aeecd76 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -2,6 +2,7 @@ properties([ pipelineTriggers([cron('21 01 * * *')]), // scheduling to trigger jenkins job parameters([ + string(name: 'ENVIRONMENT', defaultValue: 'aat', description: 'Environment to test'), string(name: 'URL_TO_TEST', defaultValue: 'http://rd-caseworker-ref-api-aat.service.core-compute-aat.internal', description: 'The URL you want to run these tests against'), string(name: 'SecurityRules', defaultValue: 'http://raw.githubusercontent.com/hmcts/security-test-rules/master/conf/security-rules.conf', @@ -22,7 +23,12 @@ def secrets = [ 'rd-${env}': [ secret('CA-REF-OAUTH2-CLIENT-SECRET', 'CA_REF_OAUTH2_CLIENT_SECRET'), secret('CA-REF-OAUTH2-CLIENT-ID', 'CA_REF_OAUTH2_CLIENT_ID'), - secret('LD-SDK-KEY', 'LD_SDK_KEY') + secret('LD-SDK-KEY', 'LD_SDK_KEY'), + secret('caseworker-ref-api-POSTGRES-HOST', 'FUNC_DATABASE_HOST'), + secret('caseworker-ref-api-POSTGRES-PASS', 'FUNC_DATABASE_PASS'), + secret('caseworker-ref-api-POSTGRES-USER', 'FUNC_DATABASE_USER'), + secret('caseworker-ref-api-POSTGRES-DATABASE', 'FUNC_DATABASE_NAME'), + secret('caseworker-ref-api-POSTGRES-PORT', 'FUNC_DATABASE_PORT'), ] ] @@ -40,6 +46,13 @@ def vaultOverrides = [ 'spreview': 'saat' ] + +import uk.gov.hmcts.contino.AppPipelineConfig + +def subscription = "nonprod" +def config = new AppPipelineConfig() +config.vaultSecrets = secrets + withNightlyPipeline(type, product, component) { env.S2S_URL_FOR_TESTS = "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal" From c4fa8e730ec3c0ce1d22c0932f6949e89bf35dad Mon Sep 17 00:00:00 2001 From: manukundloo-hmcts Date: Tue, 16 May 2023 15:10:32 +0100 Subject: [PATCH 2/2] [RDCC-6200] Fix for delete functional test user --- Jenkinsfile_nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index 77aeecd76..1706756ab 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -28,7 +28,7 @@ def secrets = [ secret('caseworker-ref-api-POSTGRES-PASS', 'FUNC_DATABASE_PASS'), secret('caseworker-ref-api-POSTGRES-USER', 'FUNC_DATABASE_USER'), secret('caseworker-ref-api-POSTGRES-DATABASE', 'FUNC_DATABASE_NAME'), - secret('caseworker-ref-api-POSTGRES-PORT', 'FUNC_DATABASE_PORT'), + secret('caseworker-ref-api-POSTGRES-PORT', 'FUNC_DATABASE_PORT') ] ]