From ea9743b5baaf6719fbb1870ac8866a1974716c57 Mon Sep 17 00:00:00 2001 From: lukasz-wolski <1005015+lukasz-wolski@users.noreply.github.com> Date: Tue, 16 Jul 2024 11:07:43 +0100 Subject: [PATCH] Dtsrd 3041 (#880) * Delete src/main/resources/testcontainers.properties * Update Jenkinsfile_CNP * Update Jenkinsfile_nightly * Update Jenkinsfile_parameterized --- Jenkinsfile_CNP | 3 +++ Jenkinsfile_nightly | 3 +++ Jenkinsfile_parameterized | 3 +++ src/main/resources/testcontainers.properties | 1 - 4 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 src/main/resources/testcontainers.properties diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index c6d52560..1f64fa31 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -35,6 +35,9 @@ def vaultOverrides = [ // Configure branches to sync with master branch def branchesToSync = ['demo', 'ithc', 'perftest'] +// Var for testcontainers.org +env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/" + withPipeline(type, product, component) { overrideVaultEnvironments(vaultOverrides) diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly index 1242d9c5..fed6d66f 100644 --- a/Jenkinsfile_nightly +++ b/Jenkinsfile_nightly @@ -42,6 +42,9 @@ withNightlyPipeline(type, product, component) { env.S2S_URL_FOR_TESTS = "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal" env.Rules = params.SecurityRules + // Var for testcontainers.org + env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/" + overrideVaultEnvironments(vaultOverrides) loadVaultSecrets(secrets) //commented as SYNC does not have functional test cases diff --git a/Jenkinsfile_parameterized b/Jenkinsfile_parameterized index 702cd38c..9e1393d7 100644 --- a/Jenkinsfile_parameterized +++ b/Jenkinsfile_parameterized @@ -60,6 +60,9 @@ withParameterizedPipeline(type, product, component, 'sandbox', 'sandbox') { env.OAUTH2_REDIRECT_URI = params.OAUTH2_REDIRECT_URI_TO_TEST env.S2S_SECRET = params.S2S_SECRET_TO_TEST + // Var for testcontainers.org + env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/" + after('integrationTest:preview') { steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/site/serenity/**/*' } diff --git a/src/main/resources/testcontainers.properties b/src/main/resources/testcontainers.properties deleted file mode 100644 index f69ce50e..00000000 --- a/src/main/resources/testcontainers.properties +++ /dev/null @@ -1 +0,0 @@ -hub.image.name.prefix=hmctspublic.azurecr.io/imported/