From 67491691b9cb731ec4b02eac38a49ab00d65a6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kr=C3=A1l?= <53821852+im-konge@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:24:46 +0100 Subject: [PATCH] [ST] Update mechanism for changing the Docker registry, repository, and tag - main branch (#10947) Signed-off-by: Lukas Kral --- .../main/java/io/strimzi/systemtest/Environment.java | 7 +++---- .../java/io/strimzi/systemtest/utils/StUtils.java | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/systemtest/src/main/java/io/strimzi/systemtest/Environment.java b/systemtest/src/main/java/io/strimzi/systemtest/Environment.java index 4595b786c82..0c09331c011 100644 --- a/systemtest/src/main/java/io/strimzi/systemtest/Environment.java +++ b/systemtest/src/main/java/io/strimzi/systemtest/Environment.java @@ -190,7 +190,6 @@ public class Environment { * Defaults */ public static final String STRIMZI_ORG_DEFAULT = "strimzi"; - public static final String STRIMZI_TAG_DEFAULT = "latest"; public static final String STRIMZI_REGISTRY_DEFAULT = "quay.io"; public static final String TEST_CLIENTS_ORG_DEFAULT = "strimzi-test-clients"; private static final String TEST_LOG_DIR_DEFAULT = TestUtils.USER_PATH + "/../systemtest/target/logs/"; @@ -225,9 +224,9 @@ public class Environment { * Set values */ public static final String SYSTEM_TEST_STRIMZI_IMAGE_PULL_SECRET = getOrDefault(STRIMZI_IMAGE_PULL_SECRET_ENV, ""); - public static final String STRIMZI_ORG = getOrDefault(STRIMZI_ORG_ENV, STRIMZI_ORG_DEFAULT); - public static final String STRIMZI_TAG = getOrDefault(STRIMZI_TAG_ENV, STRIMZI_TAG_DEFAULT); - public static final String STRIMZI_REGISTRY = getOrDefault(STRIMZI_REGISTRY_ENV, STRIMZI_REGISTRY_DEFAULT); + public static final String STRIMZI_ORG = getOrDefault(STRIMZI_ORG_ENV, ""); + public static final String STRIMZI_TAG = getOrDefault(STRIMZI_TAG_ENV, ""); + public static final String STRIMZI_REGISTRY = getOrDefault(STRIMZI_REGISTRY_ENV, ""); public static final String TEST_LOG_DIR = getOrDefault(TEST_LOG_DIR_ENV, TEST_LOG_DIR_DEFAULT); public static final String PERFORMANCE_DIR = getOrDefault(PERFORMANCE_DIR_ENV, PERFORMANCE_DIR_DEFAULT); public static final String ST_KAFKA_VERSION = getOrDefault(ST_KAFKA_VERSION_ENV, ST_KAFKA_VERSION_DEFAULT); diff --git a/systemtest/src/main/java/io/strimzi/systemtest/utils/StUtils.java b/systemtest/src/main/java/io/strimzi/systemtest/utils/StUtils.java index 107057b82cd..1a0a27f895b 100644 --- a/systemtest/src/main/java/io/strimzi/systemtest/utils/StUtils.java +++ b/systemtest/src/main/java/io/strimzi/systemtest/utils/StUtils.java @@ -108,14 +108,14 @@ public static boolean isAllowOnCurrentEnvironment(String envVariableForCheck) { public static String changeOrgAndTag(String image) { Matcher m = IMAGE_PATTERN_FULL_PATH.matcher(image); if (m.find()) { - String registry = setImageProperties(m.group("registry"), Environment.STRIMZI_REGISTRY, Environment.STRIMZI_REGISTRY_DEFAULT); - String org = setImageProperties(m.group("org"), Environment.STRIMZI_ORG, Environment.STRIMZI_ORG_DEFAULT); + String registry = setImageProperties(m.group("registry"), Environment.STRIMZI_REGISTRY); + String org = setImageProperties(m.group("org"), Environment.STRIMZI_ORG); return registry + "/" + org + "/" + m.group("image") + ":" + buildTag(m.group("tag")); } m = IMAGE_PATTERN.matcher(image); if (m.find()) { - String org = setImageProperties(m.group("org"), Environment.STRIMZI_ORG, Environment.STRIMZI_ORG_DEFAULT); + String org = setImageProperties(m.group("org"), Environment.STRIMZI_ORG); return Environment.STRIMZI_REGISTRY + "/" + org + "/" + m.group("image") + ":" + buildTag(m.group("tag")); } @@ -132,15 +132,15 @@ public static String changeOrgAndTagInImageMap(String imageMap) { return sb.toString(); } - private static String setImageProperties(String current, String envVar, String defaultEnvVar) { - if (!envVar.equals(defaultEnvVar) && !current.equals(envVar)) { + private static String setImageProperties(String current, String envVar) { + if (!envVar.isEmpty() && !current.equals(envVar)) { return envVar; } return current; } private static String buildTag(String currentTag) { - if (!currentTag.equals(Environment.STRIMZI_TAG) && !Environment.STRIMZI_TAG_DEFAULT.equals(Environment.STRIMZI_TAG)) { + if (!Environment.STRIMZI_TAG.isEmpty() && !currentTag.equals(Environment.STRIMZI_TAG)) { Matcher t = KAFKA_COMPONENT_PATTERN.matcher(currentTag); if (t.find()) { currentTag = Environment.STRIMZI_TAG + t.group("kafka") + t.group("version");