From 7d5f55ef879e15e53a8cced9340c5978dbfc815d Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 12 May 2023 19:24:40 -0700 Subject: [PATCH] Refactor the VmwHarborProxyImageNameSubstitutor class to detect the Jenkins CI environment. --- .../testcontainers/VmwHarborProxyImageNameSubstitutor.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/testcontainers/VmwHarborProxyImageNameSubstitutor.java b/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/testcontainers/VmwHarborProxyImageNameSubstitutor.java index c5d0b0db..a383a394 100644 --- a/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/testcontainers/VmwHarborProxyImageNameSubstitutor.java +++ b/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/testcontainers/VmwHarborProxyImageNameSubstitutor.java @@ -53,12 +53,19 @@ public class VmwHarborProxyImageNameSubstitutor extends ImageNameSubstitutor { originalDockerImageName = originalDockerImageName.substring(TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX.length() - 1); resolvedDockerImageName = String.format(TESTCONTAINERS_HUB_IMAGE_NAME_TEMPLATE, originalDockerImageName); } + else if (isJenkinsEnvironment()) { + resolvedDockerImageName = String.format(TESTCONTAINERS_HUB_IMAGE_NAME_TEMPLATE, originalDockerImageName); + } logInfo("Resolved Docker Image Name [{}]", resolvedDockerImageName); return DockerImageName.parse(resolvedDockerImageName); } + private boolean isJenkinsEnvironment() { + return Boolean.TRUE.equals(Boolean.getBoolean("jenkins")); + } + @Override protected String getDescription() { return "VMware Harbor Proxy Image Name Substitutor";