Skip to content

Use unique path for FMW domain on pv #3056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Use unique path for FMW domain on pv #3056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09d0076
initial fix
maggiehe00 May 11, 2022
67a3670
wip
maggiehe00 May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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")
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FmwUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down