Merge branch 'backport-oke-parallel-r42-p2' into 'release/4.2'

[OKE] [backport] internal OKE conversion in OWLS-115531 on main into release/4.2

See merge request weblogic-cloud/weblogic-kubernetes-operator!4716

Author: rjeberhard

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

@@ -37,6 +37,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.MANAGED_SERVER_NAME_BASE;
 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.OKE_CLUSTER;
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
 import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
@@ -46,6 +47,7 @@
 import static oracle.weblogic.kubernetes.actions.impl.Domain.scaleClusterWithRestApi;
 import static oracle.weblogic.kubernetes.utils.ClusterUtils.createClusterResourceAndAddReferenceToDomain;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkPodReadyAndServiceExists;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.scaleAndVerifyCluster;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.verifyClusterAfterScaling;
 import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
 import static oracle.weblogic.kubernetes.utils.OKDUtils.createRouteForOKD;
@@ -66,7 +68,7 @@
  */
 @DisplayName("Test Operator and WebLogic domain with Dedicated set to true")
 @Tag("kind-sequential")
-@Tag("oke-sequential")
+@Tag("oke-gate")
 @Tag("okd-wls-mrg")
 @IntegrationTest
 class ItDedicatedMode {
@@ -208,8 +210,13 @@ void testDedicatedModeSameNamespace() {
     }
 
     logger.info("scaling the cluster from {0} servers to {1} servers", replicaCount, replicaCount + 1);
-    scaleClusterWithRestApi(domainUid, clusterName, replicaCount + 1,
-        externalRestHttpshost, externalRestHttpsPort, opNamespace, opServiceAccount);
+    if (OKE_CLUSTER) {
+      scaleAndVerifyCluster(clusterResName, domainUid, domain1Namespace, managedServerPodPrefix,
+          replicaCount, replicaCount + 1, null, null);
+    } else {
+      scaleClusterWithRestApi(domainUid, clusterName, replicaCount + 1,
+          externalRestHttpshost, externalRestHttpsPort, opNamespace, opServiceAccount);
+    }
 
     verifyClusterAfterScaling(domainUid, domain1Namespace, managedServerPodPrefix,
         replicaCount, replicaCount + 1, null, null, listOfPodCreationTimestamp);

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

@@ -78,7 +78,7 @@
 @DisplayName("Test dynamic updates to a model in image domain, part3")
 @IntegrationTest
 @Tag("olcne-mrg")
-@Tag("oke-sequential")
+@Tag("oke-gate")
 @Tag("kind-parallel")
 @Tag("toolkits-srg")
 @Tag("okd-wls-mrg")
@@ -302,8 +302,7 @@ void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() {
 
     // This test uses the WebLogic domain created in BeforeAll method
     // BeforeEach method ensures that the server pods are running
-    LinkedHashMap<String, OffsetDateTime> pods =
-        helper.addDataSourceAndVerify(false);
+    LinkedHashMap<String, OffsetDateTime> pods = helper.addDataSourceAndVerify(false);
 
     // Replace contents of an existing configMap with cm config and application target as
     // there are issues with removing them, WDT-535
@@ -328,7 +327,6 @@ void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() {
 
     verifyPodIntrospectVersionUpdated(pods.keySet(), introspectVersion, helper.domainNamespace);
 
-
     // check datasource configuration using REST api
     if (OKE_CLUSTER) {
       assertTrue(checkSystemResourceConfigViaAdminPod(helper.adminServerPodName, helper.domainNamespace,
@@ -377,8 +375,7 @@ void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() {
 
     // write sparse yaml to delete datasource to file, delete ds to keep the config clean
     Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml");
-    String yamlToDeleteDS = "resources:\n"
-        + "  JDBCSystemResource:\n";
+    String yamlToDeleteDS = "resources:\n" + "  JDBCSystemResource:\n";
 
     assertDoesNotThrow(() -> Files.write(pathToDeleteDSYaml, yamlToDeleteDS.getBytes()));
 
@@ -426,12 +423,9 @@ void testMiiChangeDataSourceParameterWithCommitUpdateAndRoll() {
     }
     logger.info("JDBCSystemResource Datasource is deleted");
 
-
-
     // check that the domain status condition contains the correct type and expected status
     logger.info("verifying the domain status condition contains the correct type and expected status");
     helper.verifyDomainStatusConditionNoErrorMsg("Completed", "True");
-
   }
 
   private void verifyIntrospectorFailsWithExpectedErrorMsg(String expectedErrorMsg) {