Merge branch 'fmwdomainonpvsample-fix' into 'release/4.2'

[wko-nightly] Fix ItFmwDomainOnPVSample.testInitialMain nightly failures in release/4.2

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

Author: rjeberhard

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

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
 import oracle.weblogic.kubernetes.actions.impl.UniqueName;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
@@ -55,12 +56,13 @@
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.backupReports;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
 import static oracle.weblogic.kubernetes.utils.CommonTestUtils.restoreReports;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
+import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
 import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
 import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test and verify Domain on PV FMW domain sample.
@@ -256,16 +258,20 @@ public void testInitialMain() {
       createPVHostPathAndChangePermissionInKindCluster("/shared", envMap);
     }
 
-    execTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main");
+    testUntil(
+        withLongRetryPolicy,
+        checkTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main"),
+        logger,
+        "create PV HostPath and change Permission in Kind Cluster");
   }
 
   /**
    * Run script run-test.sh.
    * @param arg arguments to execute script
    * @param errString a string of detailed error
    */
-  private void execTestScriptAndAssertSuccess(String arg,
-                                              String errString) {
+  private boolean execTestScriptAndAssertSuccess(String arg,
+                                                 String errString) {
 
     Assumptions.assumeTrue(previousTestSuccessful);
     previousTestSuccessful = false;
@@ -292,9 +298,15 @@ private void execTestScriptAndAssertSuccess(String arg,
     outStr += ", stderr=\n{\n" + (result != null ? result.stderr() : "") + "\n}\n";
     outStr += ", stdout=\n{\n" + (result != null ? result.stdout() : "") + "\n}\n";
 
-    assertTrue(success, outStr);
+    logger.info("output String is: {0}", outStr);
 
     previousTestSuccessful = true;
+
+    return success;
+  }
+
+  private Callable<Boolean> checkTestScriptAndAssertSuccess(String arg, String errString) {
+    return () -> execTestScriptAndAssertSuccess(arg, errString);
   }
 
   /**