From 199831635f73159bbb23477907ee6581a3ea7953 Mon Sep 17 00:00:00 2001 From: Sankar Neelakandan Date: Tue, 3 May 2022 10:52:25 -0700 Subject: [PATCH 1/3] make the domain path unique since many domains will be created in the same test suite --- .../weblogic/kubernetes/ItKubernetesDomainEvents.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java index 72ae921dddf..dc54f7b9018 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java @@ -739,6 +739,8 @@ private static void createDomain(String domainNamespace, String domainUid, Strin private static Domain createDomain(String domainNamespace, String domainUid, String pvName, String pvcName, String serverStartupPolicy) { + String uniquePath = "/shared/" + domainNamespace + "/domains"; + // create pull secrets for WebLogic image when running in non Kind Kubernetes cluster // this secret is used only for non-kind cluster createSecretForBaseImages(domainNamespace); @@ -757,7 +759,7 @@ private static Domain createDomain(String domainNamespace, String domainUid, -> File.createTempFile("domain", "properties"), "Failed to create domain properties file"); Properties p = new Properties(); - p.setProperty("domain_path", "/shared/domains"); + p.setProperty("domain_path", uniquePath); p.setProperty("domain_name", domainUid); p.setProperty("cluster_name", cluster1Name); p.setProperty("admin_server_name", adminServerName); @@ -769,7 +771,7 @@ private static Domain createDomain(String domainNamespace, String domainUid, p.setProperty("admin_t3_channel_port", Integer.toString(t3ChannelPort)); p.setProperty("number_of_ms", "2"); p.setProperty("managed_server_name_base", managedServerNameBase); - p.setProperty("domain_logs", "/shared/logs"); + p.setProperty("domain_logs", uniquePath + "/logs"); p.setProperty("production_mode_enabled", "true"); assertDoesNotThrow(() -> p.store(new FileOutputStream(domainPropertiesFile), "domain properties file"), @@ -792,7 +794,7 @@ private static Domain createDomain(String domainNamespace, String domainUid, .namespace(domainNamespace)) .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(WEBLOGIC_IMAGE_TO_USE_IN_SPEC) .imagePullPolicy("IfNotPresent") @@ -804,7 +806,7 @@ private static Domain createDomain(String domainNamespace, String domainUid, .namespace(domainNamespace)) .includeServerOutInPodLog(true) .logHomeEnabled(Boolean.TRUE) - .logHome("/shared/logs/" + domainUid) + .logHome(uniquePath + "/logs/" + domainUid) .dataHome("") .serverStartPolicy(serverStartupPolicy) .serverPod(new ServerPod() //serverpod From 157dc834365aa49683db1f1d3f150a582eda0bca Mon Sep 17 00:00:00 2001 From: Sankar Neelakandan Date: Tue, 3 May 2022 11:45:24 -0700 Subject: [PATCH 2/3] fix the logHome to use unique path --- .../oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java index dc54f7b9018..c8e531f893c 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java @@ -546,13 +546,14 @@ void testLogHomeChangeEvents() { Map podsWithTimeStamps = getPodsWithTimeStamps(domainNamespace3, adminServerPodName, managedServerPodNamePrefix, replicaCount); + String uniquePath = "/shared/" + domainNamespace3 + "/domains/logHome"; //print out the original image name String logHome = domain1.getSpec().getLogHome(); - logger.info("Currently the log home used by the domain is: {0}", logHome); + logger.info("Changing the current log home used by the domain : {0} to {1}", logHome, uniquePath); //change logHome from /shared/logs to /shared/logs/logHome String patchStr = "[" - + "{\"op\": \"replace\", \"path\": \"/spec/logHome\", \"value\": \"/shared/logs/logHome\"}" + + "{\"op\": \"replace\", \"path\": \"/spec/logHome\", \"value\": \"" + uniquePath + "\"}" + "]"; logger.info("PatchStr for logHome: {0}", patchStr); From 76894c75bc0b942f6543a1d37e1ad71b9001e9d6 Mon Sep 17 00:00:00 2001 From: Sankar Neelakandan Date: Tue, 3 May 2022 13:01:17 -0700 Subject: [PATCH 3/3] fix the logHome in verification --- .../weblogic/kubernetes/ItKubernetesDomainEvents.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java index c8e531f893c..acf6da812c6 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java @@ -546,14 +546,14 @@ void testLogHomeChangeEvents() { Map podsWithTimeStamps = getPodsWithTimeStamps(domainNamespace3, adminServerPodName, managedServerPodNamePrefix, replicaCount); - String uniquePath = "/shared/" + domainNamespace3 + "/domains/logHome"; + String newLogHome = "/shared/" + domainNamespace3 + "/domains/logHome"; //print out the original image name String logHome = domain1.getSpec().getLogHome(); - logger.info("Changing the current log home used by the domain : {0} to {1}", logHome, uniquePath); + logger.info("Changing the current log home used by the domain : {0} to {1}", logHome, newLogHome); //change logHome from /shared/logs to /shared/logs/logHome String patchStr = "[" - + "{\"op\": \"replace\", \"path\": \"/spec/logHome\", \"value\": \"" + uniquePath + "\"}" + + "{\"op\": \"replace\", \"path\": \"/spec/logHome\", \"value\": \"" + newLogHome + "\"}" + "]"; logger.info("PatchStr for logHome: {0}", patchStr); @@ -567,7 +567,7 @@ void testLogHomeChangeEvents() { //print out logHome in the new patched domain logger.info("In the new patched domain logHome is: {0}", domain1.getSpec().getLogHome()); - assertEquals("/shared/logs/logHome", domain1.getSpec().getLogHome(), "logHome is not updated"); + assertEquals(newLogHome, domain1.getSpec().getLogHome(), "logHome is not updated"); // verify the server pods are rolling restarted and back to ready state logger.info("Verifying rolling restart occurred for domain {0} in namespace {1}",