From 909688a8b21713fffcb4b05e5ea2d2575a232d21 Mon Sep 17 00:00:00 2001 From: David Kornel Date: Wed, 31 Jul 2024 12:10:26 +0200 Subject: [PATCH] Add fixes Signed-off-by: David Kornel --- src/main/java/io/streams/constants/TestConstants.java | 6 ++++++ .../operators/manifests/StrimziManifestInstaller.java | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/streams/constants/TestConstants.java b/src/main/java/io/streams/constants/TestConstants.java index 418abbf..402d57c 100644 --- a/src/main/java/io/streams/constants/TestConstants.java +++ b/src/main/java/io/streams/constants/TestConstants.java @@ -4,6 +4,12 @@ */ package io.streams.constants; +import io.streams.Environment; + +import java.nio.file.Path; +import java.nio.file.Paths; + public interface TestConstants { String LOG_COLLECT_LABEL = "streams-e2e"; + Path YAML_MANIFEST_PATH = Paths.get(Environment.USER_PATH, "operator-install-files"); } diff --git a/src/main/java/io/streams/operators/manifests/StrimziManifestInstaller.java b/src/main/java/io/streams/operators/manifests/StrimziManifestInstaller.java index 188e091..240e773 100644 --- a/src/main/java/io/streams/operators/manifests/StrimziManifestInstaller.java +++ b/src/main/java/io/streams/operators/manifests/StrimziManifestInstaller.java @@ -18,14 +18,13 @@ import io.skodjob.testframe.TestFrameConstants; import io.skodjob.testframe.resources.KubeResourceManager; import io.skodjob.testframe.wait.Wait; -import io.streams.Environment; +import io.streams.constants.TestConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedList; @@ -39,8 +38,8 @@ public class StrimziManifestInstaller { private static final Logger LOGGER = LoggerFactory.getLogger(StrimziManifestInstaller.class); - private static Path filesDir = Paths.get(Environment.USER_PATH, "operator-install-files", - "strimzi-kafka-operator", "install", "cluster-operator"); + private static Path filesDir = TestConstants.YAML_MANIFEST_PATH.resolve("strimzi-kafka-operator").resolve( + "install").resolve("cluster-operator"); /** * Deployment name for strimzi operator