diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java index 9da85317191..3651946d0a5 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java @@ -78,8 +78,7 @@ class ItFmwDomainInPVUsingWDT { private static final String RCUSYSPASSWORD = "Oradoc_db1"; private static final String RCUSCHEMAUSERNAME = "myrcuuser"; private static final String RCUSCHEMAPASSWORD = "Oradoc_db1"; - - private static final String DOMAINHOMEPREFIX = "/shared/domains/"; + private static final String DOMAINHOMEPREFIX = "/shared/" + domainNamespace + "/domains/"; private static String dbUrl = null; private static LoggingFacade logger = null; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java index 9d03e77844a..248b30048ac 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java @@ -195,10 +195,11 @@ void testFmwDomainInPvUsingWlst() { java_home = getImageEnvVar(FMWINFRA_IMAGE_TO_USE_IN_SPEC, "JAVA_HOME"); logger.info("JAVA_HOME in image {0} is: {1}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, java_home); + String uniquePath = "/shared/" + jrfDomainNamespace + "/domains/"; Properties p = new Properties(); p.setProperty("oracleHome", oracle_home); //default $ORACLE_HOME p.setProperty("javaHome", java_home); //default $JAVA_HOME - p.setProperty("domainParentDir", "/shared/domains/"); + p.setProperty("domainParentDir", uniquePath); p.setProperty("domainName", domainUid); p.setProperty("domainUser", ADMIN_USERNAME_DEFAULT); p.setProperty("domainPassword", ADMIN_PASSWORD_DEFAULT); @@ -237,7 +238,7 @@ void testFmwDomainInPvUsingWlst() { .namespace(jrfDomainNamespace)) .spec(new DomainSpec() .domainUid(domainUid) - .domainHome("/shared/domains/" + domainUid) // point to domain home in pv + .domainHome(uniquePath + domainUid) // point to domain home in pv .domainHomeSourceType("PersistentVolume") // set the domain home source type as pv .image(FMWINFRA_IMAGE_TO_USE_IN_SPEC) .imagePullPolicy("IfNotPresent") @@ -249,7 +250,7 @@ void testFmwDomainInPvUsingWlst() { .namespace(jrfDomainNamespace)) .includeServerOutInPodLog(true) .logHomeEnabled(Boolean.TRUE) - .logHome("/shared/logs/" + domainUid) + .logHome(uniquePath + "logs/" + domainUid) .dataHome("") .serverStartPolicy("IF_NEEDED") .serverPod(new ServerPod() //serverpod diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FmwUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FmwUtils.java index c44da035695..91c8020a437 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FmwUtils.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FmwUtils.java @@ -150,7 +150,7 @@ public static Domain createDomainResourceOnPv(String domainUid, .namespace(domNamespace)) .includeServerOutInPodLog(true) .logHomeEnabled(Boolean.TRUE) - .logHome("/shared/logs/" + domainUid) + .logHome(domainInHomePrefix + "logs/" + domainUid) .dataHome("") .serverStartPolicy("IF_NEEDED") .serverPod(new ServerPod() //serverpod