upgrade test frame version (kroxylicious#2127)

* upgrade test frame version

Signed-off-by: Francisco Vila <fvila@redhat.com>

* upgrade test frame version

Signed-off-by: Francisco Vila <fvila@redhat.com>

---------

Signed-off-by: Francisco Vila <fvila@redhat.com>
Signed-off-by: Francisco Vila <57452611+franvila@users.noreply.github.com>

Author: franvila

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/resources/operator/KroxyliciousOperatorBundleInstaller.java

@@ -30,14 +30,14 @@
 import io.skodjob.testframe.enums.InstallType;
 import io.skodjob.testframe.installation.InstallationMethod;
 import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.testframe.utils.ImageUtils;
 import io.skodjob.testframe.utils.TestFrameUtils;
 
 import io.kroxylicious.systemtests.Constants;
 import io.kroxylicious.systemtests.Environment;
 import io.kroxylicious.systemtests.k8s.KubeClusterResource;
 import io.kroxylicious.systemtests.utils.DeploymentUtils;
 import io.kroxylicious.systemtests.utils.NamespaceUtils;
-import io.kroxylicious.systemtests.utils.TestUtils;
 
 import static io.kroxylicious.systemtests.k8s.KubeClusterResource.kubeClient;
 
@@ -139,7 +139,7 @@ private void applyDeploymentFile() {
                 .endMetadata()
                 .editSpec()
                 .editFirstContainer()
-                .withImage(TestUtils.changeRegistryOrgImageAndTag(deploymentImage, Environment.KROXYLICIOUS_OPERATOR_REGISTRY,
+                .withImage(ImageUtils.changeRegistryOrgImageAndTag(deploymentImage, Environment.KROXYLICIOUS_OPERATOR_REGISTRY,
                         Environment.KROXYLICIOUS_OPERATOR_ORG, Environment.KROXYLICIOUS_OPERATOR_IMAGE, Environment.KROXYLICIOUS_OPERATOR_VERSION))
                 .withImagePullPolicy(Constants.PULL_IMAGE_IF_NOT_PRESENT)
                 .endContainer()

kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/utils/TestUtils.java

@@ -16,11 +16,6 @@
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -31,10 +26,7 @@
  * The type Test utils.
  */
 public class TestUtils {
-    private static final Logger LOGGER = LoggerFactory.getLogger(TestUtils.class);
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-    private static final Pattern IMAGE_PATTERN_FULL_PATH = Pattern.compile("^(?<registry>[^/]*)/(?<org>[^/]*)/(?<image>[^:]*):(?<tag>.*)$");
-    private static final Pattern IMAGE_PATTERN = Pattern.compile("^(?<org>[^/]*)/(?<image>[^:]*):(?<tag>.*)$");
 
     private TestUtils() {
     }
@@ -112,50 +104,4 @@ public static String getJsonFileContent(String fileName) {
             throw new UncheckedIOException(e);
         }
     }
-
-    // TO BE REMOVED when introduced in ImageUtils from TestFrame project
-
-    /**
-     * Change registry org image and tag.
-     *
-     * @param imageRepo the image repo
-     * @param newRegistry the new registry
-     * @param newOrg the new org
-     * @param newImage the new image
-     * @param newTag the new tag
-     * @return the string
-     */
-    public static String changeRegistryOrgImageAndTag(String imageRepo, String newRegistry, String newOrg, String newImage, String newTag) {
-        Matcher m = IMAGE_PATTERN_FULL_PATH.matcher(imageRepo);
-        if (m.find()) {
-            String registry = setImagePropertiesIfNeeded(m.group("registry"), newRegistry);
-            String org = setImagePropertiesIfNeeded(m.group("org"), newOrg);
-            String tag = setImagePropertiesIfNeeded(m.group("tag"), newTag);
-            String image = setImagePropertiesIfNeeded(m.group("image"), newImage);
-
-            String newImageRepo = registry + "/" + org + "/" + image + ":" + tag;
-            LOGGER.info("Updating container image to {}", newImageRepo);
-            return newImageRepo;
-        }
-        else {
-            m = IMAGE_PATTERN.matcher(imageRepo);
-            if (m.find()) {
-                String registry = newRegistry != null ? newRegistry + "/" : "";
-                String org = setImagePropertiesIfNeeded(m.group("org"), newOrg);
-                String tag = setImagePropertiesIfNeeded(m.group("tag"), newTag);
-                String image = setImagePropertiesIfNeeded(m.group("image"), newImage);
-
-                String newImageRepo = registry + org + "/" + image + ":" + tag;
-                LOGGER.info("Updating container image to {}", newImageRepo);
-                return newImageRepo;
-            }
-            else {
-                return imageRepo;
-            }
-        }
-    }
-
-    private static String setImagePropertiesIfNeeded(String currentValue, String newValue) {
-        return newValue != null && !newValue.isEmpty() && !currentValue.equals(newValue) ? newValue : currentValue;
-    }
 }

pom.xml

@@ -78,7 +78,7 @@
         <netty-leak-detector-junit-extension.version>0.0.8</netty-leak-detector-junit-extension.version>
         <wiremock.version>3.13.0</wiremock.version>
         <docker-java.version>3.5.0</docker-java.version>
-        <test-frame.version>0.12.0</test-frame.version>
+        <test-frame.version>0.13.0</test-frame.version>
         <junit-pioneer.version>2.3.0</junit-pioneer.version>
         <skip-validate-yaml-snippets>true</skip-validate-yaml-snippets>
     </properties>