Merge branch 'owls126595_rel42' into 'release/4.2'

Owls126595 rel42

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

Author: rjeberhard

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

@@ -47,6 +47,7 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withStandardRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.PodUtils.getExternalServicePodName;
+import static oracle.weblogic.kubernetes.utils.PodUtils.getPodCreationTime;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -74,6 +75,8 @@ class ItMiiDynamicUpdatePart2 {
   public static Path pathToChangReadsYaml = null;
   static LoggingFacade logger = null;
 
+  static boolean isDataSourceCreated = false;
+
   /**
    * Install Operator.
    * Create domain resource defintion.
@@ -167,7 +170,7 @@ void testMiiDeleteAppChangeDBUrlWithCommitUpdateAndRoll() {
     assertNotEquals(-1, adminServiceNodePort, "admin server default node port is not valid");
     assertTrue(checkSystemResourceConfigViaAdminPod(helper.adminServerPodName, helper.domainNamespace,
         "JDBCSystemResources/TestDataSource2/JDBCResource/JDBCDriverParams",
-        "newdburl"), "JDBCSystemResource DB URL not found");
+        "jdbc:oracle:thin:@host:1234:sid"), "JDBCSystemResource DB URL not found");
     logger.info("JDBCSystemResource DB URL found");
 
     // verify the application is undeployed
@@ -179,6 +182,7 @@ void testMiiDeleteAppChangeDBUrlWithCommitUpdateAndRoll() {
     // check that the domain status condition contains the correct type and expected reason
     logger.info("verifying the domain status condition contains the correct type and expected status");
     helper.verifyDomainStatusConditionNoErrorMsg("Completed", "True");
+    isDataSourceCreated = true;
   }
 
   /**
@@ -197,9 +201,18 @@ void testMiiDeleteDatasource() {
 
     // 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 = new LinkedHashMap();
+    if (!isDataSourceCreated) {
+      pods = helper.addDataSourceAndVerify(false);
+    } else {
+      // get the creation time of the admin server pod before patching
+      pods.put(helper.adminServerPodName, getPodCreationTime(helper.domainNamespace, helper.adminServerPodName));
+      // get the creation time of the managed server pods before patching
+      for (int i = 1; i <= helper.replicaCount; i++) {
+        pods.put(helper.managedServerPrefix + i,
+                getPodCreationTime(helper.domainNamespace, helper.managedServerPrefix + i));
+      }
+    }
     // write sparse yaml to delete datasource to file
     Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml");
     String yamlToDeleteDS = "resources:\n"

integration-tests/src/test/resources/wdt-models/model.jdbc2.update2.yaml

@@ -14,7 +14,7 @@ resources:
                     RowPrefetchSize: 200
                     JNDIName: jdbc/TestDataSource2
                 JDBCDriverParams:
-                    URL: 'newdburl'
+                    URL: 'jdbc:oracle:thin:@host:1234:sid'
                     PasswordEncrypted: '@@SECRET:@@ENV:DOMAIN_UID@@-db-secret:password@@'
                     DriverName: oracle.jdbc.OracleDriver
                     Properties: