increase RCU pods timeout and backport PR to main (#3884)

Author: xiancao

integration-tests/src/test/java/oracle/weblogic/kubernetes/ItTwoDomainsManagedByTwoOperators.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;
@@ -547,21 +547,21 @@ private void verifyDomain2NotChanged(String domain2Namespace) {
     logger.info("Checking that domain2 admin server pod state was not changed");
     assertThat(podStateNotChanged(domain2AdminServerPodName, domain2Uid, domain2Namespace,
         domainAdminPodOriginalTimestamps.get(1)))
-        .as("Test state of pod {0} was not changed in namespace {1}",
-            domain2AdminServerPodName, domain2Namespace)
-        .withFailMessage("State of pod {0} was changed in namespace {1}",
-            domain2AdminServerPodName, domain2Namespace)
+        .as(String.format("Test state of pod %s was not changed in namespace %s",
+            domain2AdminServerPodName, domain2Namespace))
+        .withFailMessage(String.format("State of pod %s was changed in namespace %s",
+            domain2AdminServerPodName, domain2Namespace))
         .isTrue();
 
     logger.info("Checking that domain2 managed server pods states were not changed");
     for (int i = 1; i <= replicaCount; i++) {
       String managedServerPodName = domain2Uid + "-" + MANAGED_SERVER_NAME_BASE + i;
       assertThat(podStateNotChanged(managedServerPodName, domain2Uid, domain2Namespace,
           domain2ManagedServerPodOriginalTimestampList.get(i - 1)))
-          .as("Test state of pod {0} was not changed in namespace {1}",
-              managedServerPodName, domain2Namespace)
-          .withFailMessage("State of pod {0} was changed in namespace {1}",
-              managedServerPodName, domain2Namespace)
+          .as(String.format("Test state of pod %s was not changed in namespace %s",
+              managedServerPodName, domain2Namespace))
+          .withFailMessage(String.format("State of pod %s was changed in namespace %s",
+              managedServerPodName, domain2Namespace))
           .isTrue();
     }
   }
@@ -736,21 +736,21 @@ private void verifyDomain1NotChanged() {
     logger.info("Checking that domain1 admin server pod state was not changed");
     assertThat(podStateNotChanged(domain1AdminServerPodName, domain1Uid, twoDomainsNamespace,
         domainAdminPodOriginalTimestamps.get(0)))
-        .as("Test state of pod {0} was not changed in namespace {1}",
-            domain1AdminServerPodName, twoDomainsNamespace)
-        .withFailMessage("State of pod {0} was changed in namespace {1}",
-            domain1AdminServerPodName, twoDomainsNamespace)
+        .as(String.format("Test state of pod %s was not changed in namespace %s",
+            domain1AdminServerPodName, twoDomainsNamespace))
+        .withFailMessage(String.format("State of pod %s was changed in namespace %s",
+            domain1AdminServerPodName, twoDomainsNamespace))
         .isTrue();
 
     logger.info("Checking that domain1 managed server pods states were not changed");
     for (int i = 1; i <= replicaCount; i++) {
       String managedServerPodName = domain1Uid + "-" + MANAGED_SERVER_NAME_BASE + i;
       assertThat(podStateNotChanged(managedServerPodName, domain1Uid, twoDomainsNamespace,
           domain1ManagedServerPodOriginalTimestampList.get(i - 1)))
-          .as("Test state of pod {0} was not changed in namespace {1}",
-              managedServerPodName, twoDomainsNamespace)
-          .withFailMessage("State of pod {0} was changed in namespace {1}",
-              managedServerPodName, twoDomainsNamespace)
+          .as(String.format("Test state of pod %s was not changed in namespace %s",
+              managedServerPodName, twoDomainsNamespace))
+          .withFailMessage(String.format("State of pod %s was changed in namespace %s",
+              managedServerPodName, twoDomainsNamespace))
           .isTrue();
     }
   }

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.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.utils;
@@ -88,6 +88,7 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.addSccToDBSvcAccount;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.checkServiceExists;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileToPod;
 import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
@@ -389,6 +390,7 @@ private static V1Pod createRcuPod(String fmwBaseImageName, String dbUrl, String
     V1Pod pvPod = Kubernetes.createPod(dbNamespace, podBody);
 
     testUntil(
+        withLongRetryPolicy,
         podReady(RCUPODNAME, null, dbNamespace),
         logger,
         "{0} to be ready in namespace {1}",