Merge branch 'xc-112466' into 'main'

OCNE: split ocne profile to ocne-srg and ocne-mrg See merge request weblogic-cloud/weblogic-kubernetes-operator!4455
oracle · Sep 29, 2023 · 3d10b8c · 3d10b8c
2 parents b1a7ebf + f5189b0
commit 3d10b8c
Show file tree

Hide file tree

Showing 80 changed files with 181 additions and 149 deletions.
diff --git a/Jenkinsfile.ocne b/Jenkinsfile.ocne
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -659,10 +659,17 @@
         </profile>
 
         <profile>
-            <id>olcne</id>
+            <id>olcne-srg</id>
             <properties>
                 <skipITs>false</skipITs>
-                <groups>olcne</groups>
+                <groups>olcne-srg</groups>
+            </properties>
+        </profile>
+        <profile>
+            <id>olcne-mrg</id>
+            <properties>
+                <skipITs>false</skipITs>
+                <groups>olcne-mrg</groups>
             </properties>
         </profile>
         <profile>

diff --git a/...ation-tests/src/test/java/oracle/weblogic/kubernetes/ItAddNewDynamicClusterUsingWlst.java b/...ation-tests/src/test/java/oracle/weblogic/kubernetes/ItAddNewDynamicClusterUsingWlst.java
@@ -49,7 +49,7 @@
 @IntegrationTest
 @Tag("oke-parallel")
 @Tag("kind-parallel")
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItAddNewDynamicClusterUsingWlst {
 
   // domain constants

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItClusterResourceScaling.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItClusterResourceScaling.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -41,7 +41,7 @@
  */
 @DisplayName("Test scaling usability ")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("oke-parallel")
 @Tag("kind-parallel")
 @Tag("okd-wls-mrg")

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCoherenceTests.java
@@ -69,7 +69,6 @@
  */
 @DisplayName("Test to create a WebLogic domain with Coherence and verify the use of Coherence cache service")
 @IntegrationTest
-@Tag("olcne")
 @Tag("kind-parallel")
 @Tag("okd-wls-mrg")
 @Tag("oke-gate")

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -132,7 +132,7 @@
 @Tag("okd-wls-mrg")
 @Tag("oke-sequential")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItConfigDistributionStrategy {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConsensusLeasingValidation.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConsensusLeasingValidation.java
@@ -37,7 +37,7 @@
 @DisplayName("Test introspector will fail with error msg if the consensus leasing is configured in the cluster")
 @IntegrationTest
 @Tag("kind-parallel")
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("oke-gate")
 class ItConsensusLeasingValidation {
 

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java
@@ -84,7 +84,6 @@
  */
 @DisplayName("Verify cross domain transaction is successful")
 @IntegrationTest
-@Tag("olcne")
 @Tag("oke-parallel")
 @Tag("kind-parallel")
 @Tag("okd-wls-srg")

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDataHomeOverride.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDataHomeOverride.java
@@ -45,7 +45,7 @@
 @DisplayName("Verify dataHome override with different dataHome setting in the domain spec")
 @IntegrationTest
 @Tag("kind-parallel")
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("oke-gate")
 class ItDataHomeOverride {
 
@@ -109,7 +109,7 @@ void testDataHomeOverrideWithDataHomeInSpec() {
     // create mii domain and override data home
     createMiiDomainAndVerify(miiDomainNamespace, domainUid, miiImage,
         adminServerPodName, managedServerPrefix, replicaCount, Arrays.asList(clusterName),
-        true, DATA_HOME_OVERRIDE);
+        true, DATA_HOME_OVERRIDE, true);
 
     // check in admin server pod, there is no data file for JMS server created
     String dataFileToCheck = DATA_HOME_OVERRIDE + "/" + domainUid + "/FILESTORE-0000000.DAT";
@@ -157,8 +157,8 @@ void testDataHomeOverrideNoDataHomeInSpec() {
     String adminServerPodName = domainUid + "-" + ADMIN_SERVER_NAME_BASE;
     String managedServerPrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
     // create mii domain and don't override data home
-    createMiiDomainAndVerify(miiDomainNamespace, domainUid, miiImage,
-        adminServerPodName, managedServerPrefix, replicaCount, Arrays.asList(clusterName), false, null);
+    createMiiDomainAndVerify(miiDomainNamespace, domainUid, miiImage, adminServerPodName,
+        managedServerPrefix, replicaCount, Arrays.asList(clusterName), false, null, true);
 
     // check in admin server pod, there is no data file for JMS server created in /u01/oracle/customFileStore
     String dataFileToCheck = "/u01/oracle/customFileStore/FILESTORE-0000000.DAT";
@@ -206,7 +206,7 @@ void testDataHomeOverrideDataHomeEmpty() {
     String managedServerPrefix = domainUid + "-" + MANAGED_SERVER_NAME_BASE;
     // create mii domain and set datahome to empty string
     createMiiDomainAndVerify(miiDomainNamespace, domainUid, miiImage,
-        adminServerPodName, managedServerPrefix, replicaCount, Arrays.asList(clusterName), true, "");
+        adminServerPodName, managedServerPrefix, replicaCount, Arrays.asList(clusterName), true, "", true);
 
     // check in admin server pod, there is no data file for JMS server created in /u01/oracle/customFileStore
     String dataFileToCheck = "/u01/oracle/customFileStore/FILESTORE-0000000.DAT";

diff --git a/...sts/src/test/java/oracle/weblogic/kubernetes/ItDiagnosticsCompleteAvailableCondition.java b/...sts/src/test/java/oracle/weblogic/kubernetes/ItDiagnosticsCompleteAvailableCondition.java
@@ -58,7 +58,7 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @DisplayName("Verify the domain status conditions for domain lifecycle")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("kind-parallel")
 @Tag("okd-wls-mrg")
 @Tag("oke-gate")

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDiagnosticsFailedCondition.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItDiagnosticsFailedCondition.java
@@ -105,7 +105,7 @@
  */
 @DisplayName("Verify the domain status failed conditions for domain lifecycle")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("kind-parallel")
 @Tag("okd-wls-mrg")
 @Tag("oke-gate")
@@ -543,8 +543,6 @@ void testNonexistentPVC() {
                           .nodePort(getNextFreePort())))));
       setPodAntiAffinity(domain);
 
-
-
       ClusterResource cluster = createClusterResource(clusterResName, wlClusterName, domainNamespace, replicaCount);
       logger.info("Creating cluster {0} in namespace {1}", clusterResName, domainNamespace);
       createClusterAndVerify(cluster);

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLogging.java
@@ -98,7 +98,7 @@
  */
 @DisplayName("Test to use Elasticsearch API to query WebLogic logs")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("kind-parallel")
 @Tag("okd-wls-mrg")
 @Tag("oke-gate")

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItElasticLoggingFluentd.java
@@ -110,7 +110,7 @@
  */
 @DisplayName("Test to use Elasticsearch API to query WebLogic logs")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("kind-parallel")
 @Tag("okd-wls-mrg")
 @Tag("oke-gate")

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItEvictedPodsCycling.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItEvictedPodsCycling.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -46,7 +46,7 @@
  */
 @DisplayName("Test WLS server pods were evicted due to Pod ephemeral storage usage exceeds the total limit")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("kind-parallel")
 @Tag("oke-gate")
 class ItEvictedPodsCycling {

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalLbTunneling.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalLbTunneling.java
@@ -109,7 +109,7 @@
 @Tag("okd-wls-mrg")
 @IntegrationTest
 @DisabledOnSlimImage
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItExternalLbTunneling {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalNodePortService.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItExternalNodePortService.java
@@ -98,7 +98,7 @@
 @Tag("okd-wls-mrg")
 @IntegrationTest
 @DisabledOnSlimImage
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItExternalNodePortService {
 
   private static String opNamespace = 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
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -69,7 +69,7 @@
 @Tag("kind-parallel")
 @Tag("okd-fmw-cert")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("oke-gate")
 class ItFmwDomainInPVUsingWLST {
 

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainOnPV.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainOnPV.java
@@ -95,7 +95,7 @@
 @Tag("kind-parallel")
 @Tag("oke-gate")
 @Tag("okd-fmw-cert")
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItFmwDomainOnPV {
 
   private static String domainNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -60,7 +60,7 @@
  */
 @DisplayName("Test to Create a FMW Dynamic Domain with Dynamic Cluster using model in image")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("oke-parallel")
 @Tag("kind-parallel")
 @Tag("okd-fmw-cert")

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java
@@ -138,7 +138,7 @@
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @DisplayName("Verify the introspectVersion runs the introspector")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-srg")
 @Tag("kind-parallel")
 @Tag("okd-wls-mrg")
 @Tag("oke-gate")

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCoherenceTests.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCoherenceTests.java
@@ -64,7 +64,6 @@
 @DisplayName("Test to create a WebLogic domain with Coherence and verify the use of Coherence cache service")
 @IntegrationTest
 @Tag("kind-parallel")
-@Tag("olcne")
 @Tag("oke-gate")
 class ItIstioCoherenceTests {
 

diff --git a/...gration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java b/...gration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -85,7 +85,6 @@
 @IntegrationTest
 @Tag("oke-parallel")
 @Tag("kind-parallel")
-@Tag("olcne")
 class ItIstioCrossDomainTransaction {
 
   private static final String WDT_MODEL_FILE_DOMAIN1 = "model-crossdomaintransaction-domain1.yaml";

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDomainInImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDomainInImage.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -71,7 +71,6 @@
 @IntegrationTest
 @Tag("oke-parallel")
 @Tag("kind-parallel")
-@Tag("olcne")
 class ItIstioDomainInImage {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDomainInPV.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDomainInPV.java
@@ -99,7 +99,7 @@
 @IntegrationTest
 @Tag("oke-parallel")
 @Tag("kind-parallel")
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItIstioDomainInPV  {
 
   private static String opNamespace = null;

diff --git a/...ration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioGatewaySessionMigration.java b/...ration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioGatewaySessionMigration.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2021, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -62,7 +62,7 @@
 @DisplayName("Test WLS Session Migration via istio enabled using Istio gateway")
 @IntegrationTest
 @Tag("kind-parallel")
-@Tag("olcne")
+@Tag("olcne-mrg")
 @Tag("oke-gate")
 class ItIstioGatewaySessionMigration {
 
@@ -212,7 +212,12 @@ void testSessionMigrationIstioGateway() {
     String primaryServerName = httpDataInfo.get(primaryServerAttr);
     String sessionCreateTime = httpDataInfo.get(sessionCreateTimeAttr);
     String countStr = httpDataInfo.get(countAttr);
-    int count = Optional.ofNullable(countStr).map(Integer::valueOf).orElse(0);
+    int count;
+    if (countStr.equalsIgnoreCase("null")) {
+      count = 0;
+    } else {
+      count = Optional.ofNullable(countStr).map(Integer::valueOf).orElse(0);
+    }
     logger.info("After patching the domain, the primary server changes to {0} "
         + ", session create time {1} and session state {2}",
         primaryServerName, sessionCreateTime, countStr);

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioManagedCoherence.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioManagedCoherence.java
@@ -73,7 +73,6 @@
 @IntegrationTest
 @Tag("oke-parallel")
 @Tag("kind-parallel")
-@Tag("olcne")
 class ItIstioManagedCoherence {
 
   // constants for Coherence

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMiiDomain.java
@@ -87,7 +87,7 @@
 @IntegrationTest
 @Tag("oke-parallel")
 @Tag("kind-parallel")
-@Tag("olcne")
+@Tag("olcne-srg")
 class ItIstioMiiDomain {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioMonitoringExporter.java
@@ -65,7 +65,7 @@
 @IntegrationTest
 @Tag("oke-parallel")
 @Tag("kind-parallel")
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItIstioMonitoringExporter {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioProductionSecureMode.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioProductionSecureMode.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes;
@@ -58,7 +58,7 @@
 @IntegrationTest
 @Tag("kind-parallel")
 @Tag("oke-gate")
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItIstioProductionSecureMode {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioSessionMigration.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioSessionMigration.java
@@ -41,7 +41,7 @@
 @IntegrationTest
 @Tag("kind-parallel")
 @Tag("oke-gate")
-@Tag("olcne")
+@Tag("olcne-mrg")
 class ItIstioSessionMigration {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioTwoDomainsInImage.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioTwoDomainsInImage.java
@@ -64,7 +64,6 @@
 @IntegrationTest
 @Tag("oke-parallel")
 @Tag("kind-parallel")
-@Tag("olcne")
 class ItIstioTwoDomainsInImage {
 
   private static String opNamespace = null;

diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java
@@ -139,7 +139,7 @@
 @Tag("okd-wls-srg")
 @Tag("oke-gate")
 @IntegrationTest
-@Tag("olcne")
+@Tag("olcne-srg")
 class ItKubernetesDomainEvents {
 
   private static String opNamespace = null;