From 27360f5d278f9b6eefd93c7b98e535fc0af26eb6 Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Wed, 31 Jul 2024 17:12:33 +0100 Subject: [PATCH] DTSAM-445 Upgrade BEFTA-FW and configure the new retry options to reduce common infrastructure FTA failures in pipelines --- Jenkinsfile_CNP | 4 ++++ Jenkinsfile_nightly | 4 ++++ build.gradle | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 82e782eb5d..412276ac52 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -64,6 +64,10 @@ env.DEFINITION_STORE_HOST = "http://ccd-definition-store-api-aat.service.core-co env.DEFINITION_STORE_URL_BASE = "http://ccd-definition-store-api-aat.service.core-compute-aat.internal" env.CCD_DATA_STORE_URL = "http://ccd-data-store-api-aat.service.core-compute-aat.internal" env.BEFTA_S2S_CLIENT_ID = "am_role_assignment_service" +env.BEFTA_RETRY_MAX_ATTEMPTS = "3" +env.BEFTA_RETRY_STATUS_CODES = "502,503,504" +env.BEFTA_RETRY_MAX_DELAY = "1000" +env.BEFTA_RETRY_NON_RETRYABLE_HTTP_METHODS = "POST,PUT" env.OAUTH2_CLIENT_ID = "am_role_assignment" env.OAUTH2_REDIRECT_URI = "http://am-role-assignment-service-aat.service.core-compute-aat.internal/oauth2redirect" env.OAUTH2_ACCESS_TOKEN_TYPE = "OIDC" diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index 47285592d6..69c6ee5a06 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -70,6 +70,10 @@ withNightlyPipeline(type, product, component) { env.S2S_URL = "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal" env.S2S_URL_BASE = "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal" env.BEFTA_S2S_CLIENT_ID = "am_role_assignment_service" + env.BEFTA_RETRY_MAX_ATTEMPTS = "3" + env.BEFTA_RETRY_STATUS_CODES = "502,503,504" + env.BEFTA_RETRY_MAX_DELAY = "1000" + env.BEFTA_RETRY_NON_RETRYABLE_HTTP_METHODS = "POST,PUT" env.DEFINITION_STORE_HOST = "http://ccd-definition-store-api-aat.service.core-compute-aat.internal" env.DEFINITION_STORE_URL_BASE = "http://ccd-definition-store-api-aat.service.core-compute-aat.internal" env.CCD_DATA_STORE_URL = "http://ccd-data-store-api-aat.service.core-compute-aat.internal" diff --git a/build.gradle b/build.gradle index 8b9fee3724..2fb751b6ed 100644 --- a/build.gradle +++ b/build.gradle @@ -489,7 +489,7 @@ dependencies { testImplementation group: 'net.serenity-bdd', name: 'serenity-rest-assured', version: versions.serenity testImplementation group: 'net.serenity-bdd', name: 'serenity-spring', version: versions.serenity testImplementation 'com.github.hmcts:fortify-client:1.4.3:all' - testImplementation 'com.github.hmcts:befta-fw:8.7.11' + testImplementation 'com.github.hmcts:befta-fw:9.0.2' testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.6.8' smokeTestImplementation group: 'net.serenity-bdd', name: 'serenity-core', version: versions.serenity