diff --git a/src/main/java/io/odh/test/OdhConstants.java b/src/main/java/io/odh/test/OdhConstants.java index cd3a8481..c3baf19c 100644 --- a/src/main/java/io/odh/test/OdhConstants.java +++ b/src/main/java/io/odh/test/OdhConstants.java @@ -30,6 +30,7 @@ private OdhConstants() { } private static final String ODH_OLM_SOURCE_NAME = "community-operators"; private static final String ODH_OLM_APP_BUNDLE_PREFIX = "opendatahub-operator"; private static final String ODH_OLM_OPERATOR_CHANNEL = "fast"; + private static final String ODH_DSCI_NAME = "default"; // TODO - should be changed after 2.5 release private static final String ODH_OLM_OPERATOR_VERSION = "v2.4.0"; private static final String ODH_OLM_UPGRADE_STARTING_OPERATOR_VERSION = "v2.4.0"; @@ -38,6 +39,7 @@ private OdhConstants() { } private static final String RHOAI_CONTROLLERS_NAMESPACE = "redhat-ods-applications"; private static final String RHOAI_DASHBOARD_ROUTE_NAME = "rhods-dashboard"; private static final String RHOAI_DASHBOARD_CONTROLLER = "rhods-dashboard"; + private static final String RHOAI_DSCI_NAME = "default-dsci"; // RHOAI OLM private static final String RHOAI_OLM_OPERATOR_NAME = "rhods-operator"; private static final String RHOAI_OLM_OPERATOR_NAMESPACE = "redhat-ods-operator"; @@ -64,6 +66,7 @@ private OdhConstants() { } public static final String DASHBOARD_ROUTE_NAME = getOdhOrRhoai("DASHBOARD_ROUTE_NAME", ODH_DASHBOARD_ROUTE_NAME, RHOAI_DASHBOARD_ROUTE_NAME); public static final String DASHBOARD_CONTROLLER = getOdhOrRhoai("DASHBOARD_CONTROLLER", ODH_DASHBOARD_CONTROLLER, RHOAI_DASHBOARD_CONTROLLER); public static final String BUNDLE_OPERATOR_NAMESPACE = getOdhOrRhoai("BUNDLE_OPERATOR_NAMESPACE", ODH_BUNDLE_OPERATOR_NAME, RHOAI_OLM_OPERATOR_NAME); + public static final String DEFAULT_DSCI_NAME = getOdhOrRhoai("DSCI_NAME", ODH_DSCI_NAME, RHOAI_DSCI_NAME); // OLM env variables public static final String OLM_OPERATOR_NAME = getOdhOrRhoai("OLM_OPERATOR_NAME", ODH_OLM_OPERATOR_NAME, RHOAI_OLM_OPERATOR_NAME); public static final String OLM_OPERATOR_NAMESPACE = getOdhOrRhoai("OLM_OPERATOR_NAMESPACE", ODH_OLM_OPERATOR_NAMESPACE, RHOAI_OLM_OPERATOR_NAMESPACE); diff --git a/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java b/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java index b343ca7c..05cceb66 100644 --- a/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java +++ b/src/test/java/io/odh/test/e2e/standard/DataScienceClusterST.java @@ -40,7 +40,7 @@ public class DataScienceClusterST extends StandardAbstract { void createDataScienceCluster() { DSCInitialization dsci = new DSCInitializationBuilder() .withNewMetadata() - .withName("default-dsci") + .withName(OdhConstants.DEFAULT_DSCI_NAME) .endMetadata() .withNewSpec() .withApplicationsNamespace(OdhConstants.CONTROLLERS_NAMESPACE) diff --git a/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java b/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java index 9f1cb9a6..77337265 100644 --- a/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java +++ b/src/test/java/io/odh/test/e2e/upgrade/UpgradeAbstract.java @@ -54,7 +54,7 @@ public abstract class UpgradeAbstract extends Abstract { protected void deployDsc(String name) { DSCInitialization dsci = new DSCInitializationBuilder() .withNewMetadata() - .withName("default-dsci") + .withName(OdhConstants.DEFAULT_DSCI_NAME) .endMetadata() .withNewSpec() .withApplicationsNamespace(OdhConstants.CONTROLLERS_NAMESPACE)