Port PRs merged to release/3.4 for OKD certification to main branch

integration-tests/pom.xml

@@ -498,51 +498,6 @@
                   **/ItMonitoringExporterSideCar,
                   **/ItMonitoringExporterSamples,
                   **/ItUsabilityOperatorHelmChart
-                  **/ItCrossDomainTransaction,
-                  **/ItCoherenceTests,
-                  **/ItConfigDistributionStrategy,
-                  **/ItDedicatedMode,
-                  **/ItDiagnosticsCompleteAvailableCondition,
-                  **/ItDiagnosticsFailedCondition,
-                  **/ItElasticLogging,
-                  **/ItElasticLoggingFluentd,
-                  **/ItExternalLbTunneling,
-                  **/ItExternalNodePortService,
-                  **/ItInitContainers,
-                  **/ItIntrospectVersion,
-                  **/ItLiftAndShiftFromOnPremDomain,
-                  **/ItLivenessProbeCustomization,
-                  **/ItManagedCoherence,
-                  **/ItManageNameSpace,
-                  **/ItMiiAuxiliaryImage,
-                  **/ItMiiAuxiliaryImageCluster,
-                  **/ItMiiCustomSslStore,
-                  **/ItMiiDomain,
-                  **/ItMiiDomainModelInPV,
-                  **/ItMiiDynamicUpdate*,
-                  **/ItMiiMultiModel,
-                  **/ItMiiNewCreateAuxImage,
-                  **/ItMiiSampleWlsAux,
-                  **/ItMiiSampleWlsMain,
-                  **/ItMiiServiceMigration,
-                  **/ItMiiUpdateDomainConfig,
-                  **/ItOperatorRestart,
-                  **/ItParameterizedDomain,
-                  **/ItPodsRestart,
-                  **/ItPodsShutdownOption,
-                  **/ItPodTemplates,
-                  **/ItProductionSecureMode,
-                  */ItRemoteConsole,
-                  **/ItServerStartPolicy,
-                  **/ItServiceStartPolicyDynamicCluster,
-                  **/ItServerStartPolicyConfigCluster,
-                  **/ItSessionMigration,
-                  **/ItStickySession,
-                  **/ItSystemResOverrides,
-                  **/ItMonitoringExporterWebApp,
-                  **/ItMonitoringExporterSideCar,
-                  **/ItMonitoringExporterSamples,
-                  **/ItUsabilityOperatorHelmChart
                 </includes-failsafe>
             </properties>
         </profile>

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java

@@ -833,6 +833,8 @@ private void verifyIntrospectorRuns() {
 
   //create a standard WebLogic domain.
   private void createDomain() {
+
+    String uniquePath = "/shared/" + domainNamespace + "/domains";
 
     // create WebLogic domain credential secret
     createSecretWithUsernamePassword(wlSecretName, domainNamespace,
@@ -848,7 +850,7 @@ private void createDomain() {
         -> 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", clusterName);
     p.setProperty("admin_server_name", adminServerName);
@@ -860,7 +862,7 @@ private void createDomain() {
     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"),
@@ -886,7 +888,7 @@ private void createDomain() {
                 .overrideDistributionStrategy("DYNAMIC")
                 .introspectorJobActiveDeadlineSeconds(300L))
             .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(V1Container.ImagePullPolicyEnum.IFNOTPRESENT)
@@ -898,7 +900,7 @@ private void createDomain() {
                 .namespace(domainNamespace))
             .includeServerOutInPodLog(true)
             .logHomeEnabled(Boolean.TRUE)
-            .logHome("/shared/logs/" + domainUid)
+            .logHome(uniquePath + "/logs/" + domainUid)
             .dataHome("")
             .serverStartPolicy("IF_NEEDED")
             .serverPod(new ServerPod() //serverpod

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalLbTunneling.java

@@ -28,6 +28,7 @@
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
 import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
 import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
+import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -54,7 +55,6 @@
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
 import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
 import static oracle.weblogic.kubernetes.TestConstants.TRAEFIK_RELEASE_NAME;
-import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -86,7 +86,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 /**
  * The use case described in this class verifies that an external RMI client
@@ -108,6 +107,7 @@
 
 @DisplayName("Test external RMI access through loadbalncer tunneling")
 @IntegrationTest
+@DisabledOnSlimImage
 class ItExternalLbTunneling {
 
   private static String opNamespace = null;
@@ -251,8 +251,6 @@ public void beforeEach() {
   @Test
   @DisplayName("Verify RMI access to WLS through Traefik LoadBalancer")
   void testExternalRmiAccessThruTraefik() {
-
-    assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
     // Build the standalone JMS Client to send and receive messages
     buildClient();
     buildClientOnPod();
@@ -311,8 +309,6 @@ void testExternalRmiAccessThruTraefik() {
   @DisplayName("Verify tls RMI access WLS through Traefik loadBalancer")
   void testExternalRmiAccessThruTraefikHttpsTunneling() {
 
-    assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
-
     // Build the standalone JMS Client to send and receive messages
     buildClient();
 
@@ -360,8 +356,6 @@ void testExternalRmiAccessThruTraefikHttpsTunneling() {
   @Test
   @DisplayName("Verify RMI access WLS through Route in OKD ")
   void testExternalRmiAccessThruRouteHttpTunneling() {
-
-    assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
     logger.info("Installing Nginx controller using helm");
 
     // Build the standalone JMS Client to send and receive messages
@@ -393,8 +387,6 @@ void testExternalRmiAccessThruRouteHttpTunneling() {
   @DisplayName("Verify tls RMI access WLS through Route in OKD ")
   void testExternalRmiAccessThruRouteHttpsTunneling() {
 
-    assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
-
     // Build the standalone JMS Client to send and receive messages
     buildClient();
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalNodePortService.java

@@ -24,6 +24,7 @@
 import oracle.weblogic.domain.DomainSpec;
 import oracle.weblogic.domain.Model;
 import oracle.weblogic.domain.ServerPod;
+import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -47,7 +48,6 @@
 import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
 import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
-import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.createDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -73,7 +73,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 /**
  * The use case verifies external RMI client access to WebLogic cluster.
@@ -92,6 +91,7 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @DisplayName("Test external RMI access through NodePort tunneling")
 @IntegrationTest
+@DisabledOnSlimImage
 class ItExternalNodePortService {
 
   private static String opNamespace = null;
@@ -206,8 +206,6 @@ public void beforeEach() {
   @Test
   @DisplayName("Verify RMI access to WLS through NodePort Service")
   void testExternalRmiAccessThruNodePortService() {
-
-    assumeFalse(WEBLOGIC_SLIM, "Skipping RMI Tunnelling Test for slim image");
     // Build the standalone JMS Client to send and receive messages
     buildClient();
     buildClientOnPod();

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java

@@ -73,7 +73,7 @@ class ItFmwDomainInPVUsingWDT {
   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;

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java

@@ -184,11 +184,13 @@ void testFmwDomainInPvUsingWlst() {
         "envVar JAVA_HOME from image is null");
     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);
@@ -227,7 +229,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(V1Container.ImagePullPolicyEnum.IFNOTPRESENT)
@@ -239,7 +241,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

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java

@@ -983,7 +983,8 @@ void testIntrospectDomainScript() {
     verifyPodsNotRolled(introDomainNamespace, pods);
   }
 
-  private static void createDomain() {
+  private static void createDomain() {    
+    String uniquePath = "/shared/" + introDomainNamespace + "/domains";
 
     // create WebLogic domain credential secret
     createSecretWithUsernamePassword(wlSecretName, introDomainNamespace,
@@ -996,7 +997,7 @@ private static void createDomain() {
             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);
@@ -1008,7 +1009,7 @@ private static void createDomain() {
     p.setProperty("admin_t3_channel_port", Integer.toString(t3ChannelPort));
     p.setProperty("number_of_ms", "2"); // maximum number of servers in cluster
     p.setProperty("managed_server_name_base", cluster1ManagedServerNameBase);
-    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"),
@@ -1031,7 +1032,7 @@ private static void createDomain() {
             .namespace(introDomainNamespace))
         .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(V1Container.ImagePullPolicyEnum.IFNOTPRESENT)
@@ -1040,7 +1041,7 @@ private static void createDomain() {
                 .namespace(introDomainNamespace))
             .includeServerOutInPodLog(true)
             .logHomeEnabled(Boolean.TRUE)
-            .logHome("/shared/logs/" + domainUid)
+            .logHome(uniquePath + "/logs/" + domainUid)
             .dataHome("")
             .serverStartPolicy("IF_NEEDED")
             .serverPod(new ServerPod() //serverpod

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java

@@ -534,7 +534,7 @@ void testLogHomeChangeEvents() {
     Map<String, OffsetDateTime> podsWithTimeStamps = getPodsWithTimeStamps(domainNamespace3,
         adminServerPodName, managedServerPodNamePrefix, replicaCount);
 
-    String newLogHome = "/shared/" + domainNamespace3 + "/domains/logHome";
+    String newLogHome = "/shared/" + domainNamespace3 + "/domains/logHome/" + domainUid;
     //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, newLogHome);

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDomain.java

@@ -291,7 +291,7 @@ void testCreateMiiDomain() {
       logger.info("WebLogic console is accessible thru default service");
     } else {
       logger.info("Checking Rest API management console in WebLogic slim image");
-      verifyCredentials(adminServerPodName, domainNamespace,
+      verifyCredentials(adminSvcExtHost, adminServerPodName, domainNamespace,
             ADMIN_USERNAME_DEFAULT, ADMIN_PASSWORD_DEFAULT, true);
     }
 

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart3.java

@@ -26,6 +26,7 @@
 
 import static oracle.weblogic.kubernetes.TestConstants.MII_DYNAMIC_UPDATE_EXPECTED_ERROR_MSG;
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
+import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_VERSION;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
@@ -259,7 +260,9 @@ void testOperatorLogIntrospectorMsg() {
     String operatorPodLog = assertDoesNotThrow(() -> getPodLog(operatorPodName, helper.opNamespace));
     logger.info("operator pod log: {0}", operatorPodLog);
     assertTrue(operatorPodLog.contains("Introspector Job Log"));
-    assertTrue(operatorPodLog.contains("WebLogic version='" + WEBLOGIC_VERSION + "'"));
+    if (!WEBLOGIC_SLIM) {
+      assertTrue(operatorPodLog.contains("WebLogic version='" + WEBLOGIC_VERSION + "'"));
+    }
     assertTrue(operatorPodLog.contains("Job " + domainUid + "-introspector has failed"));
     assertTrue(operatorPodLog.contains(MII_DYNAMIC_UPDATE_EXPECTED_ERROR_MSG));
   }

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMultiDomainModels.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 import oracle.weblogic.domain.Domain;
+import oracle.weblogic.kubernetes.annotations.DisabledOnSlimImage;
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.logging.LoggingFacade;
@@ -23,7 +24,6 @@
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_APP_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
-import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
 import static oracle.weblogic.kubernetes.assertions.TestAssertions.adminNodePortAccessible;
 import static oracle.weblogic.kubernetes.utils.CommonMiiTestUtils.createMiiDomainAndVerify;
@@ -38,7 +38,6 @@
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 /**
  * The test class creates WebLogic domains with three models.
@@ -111,9 +110,8 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
       + "verify admin console login using admin node port.")
   @ValueSource(strings = {"modelInImage", "domainInImage", "domainOnPV"})
   @Tag("gate")
+  @DisabledOnSlimImage
   void testScaleClustersAndAdminConsoleLogin(String domainType) {
-
-    assumeFalse(WEBLOGIC_SLIM, "Skipping the Console Test for slim image");
     Domain domain = createDomainBasedOnDomainType(domainType);
 
     // get the domain properties

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMultiDomainModelsWithLoadBalancer.java

@@ -623,7 +623,8 @@ void testDataHomeOverrideDomainOnPV() {
 
     Domain domainOnPV = createOrStartDomainBasedOnDomainType("domainOnPV");
     String domainUid = domainOnPV.getSpec().getDomainUid();
-    String domainNamespace = domainOnPV.getMetadata().getNamespace();
+    String domainNamespace = domainOnPV.getMetadata().getNamespace();    
+    String uniquePath = "/u01/shared/" + domainNamespace + "/domains/" + domainUid;
 
     // check in admin server pod, there is a data file for JMS server created in /u01/customFileStore
     String dataFileToCheck = "/u01/customFileStore/FILESTORE-0000000.DAT";
@@ -632,7 +633,7 @@ void testDataHomeOverrideDomainOnPV() {
 
     // check in admin server pod, the default admin server data file is in default data store
     String defaultAdminDataFile =
-        "/u01/shared/domains/" + domainUid + "/servers/admin-server/data/store/default/_WLS_ADMIN-SERVER000000.DAT";
+        uniquePath + "/servers/admin-server/data/store/default/_WLS_ADMIN-SERVER000000.DAT";
     waitForFileExistsInPod(domainNamespace, adminServerPodName, defaultAdminDataFile);
 
     // check in managed server pod, there is no custom data file for JMS is created
@@ -646,7 +647,7 @@ void testDataHomeOverrideDomainOnPV() {
           String.format("found file %s in pod %s in namespace %s, expect not exist",
               customDataFile, managedServerPodName, domainNamespace));
 
-      String defaultMSDataFile = "/u01/shared/domains/" + domainUid + "/servers/managed-server" + i
+      String defaultMSDataFile = uniquePath + "/servers/managed-server" + i
           + "/data/store/default/_WLS_MANAGED-SERVER" + i + "000000.DAT";
       waitForFileExistsInPod(domainNamespace, managedServerPodName, defaultMSDataFile);
     }