Merge branch 'backport-4435-41' into 'release/4.1'

Backport MR 4435 to release/4.1

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

Author: rjeberhard

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

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import oracle.weblogic.kubernetes.actions.impl.UniqueName;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
 import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
@@ -47,7 +48,9 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.imagePull;
 import static oracle.weblogic.kubernetes.actions.TestActions.imagePush;
 import static oracle.weblogic.kubernetes.actions.TestActions.imageTag;
+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.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
 import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
@@ -166,7 +169,9 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
   @Test
   @Order(1)
   public void testInstallOperator() {
+    String backupReports = backupReports(UniqueName.uniqueName(this.getClass().getSimpleName()));    
     execTestScriptAndAssertSuccess("-oper", "Failed to run -oper");
+    restoreReports(backupReports);
   }
 
   /**

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

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import oracle.weblogic.kubernetes.actions.impl.UniqueName;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
 import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
 import oracle.weblogic.kubernetes.annotations.IntegrationTest;
@@ -45,7 +46,9 @@
 import static oracle.weblogic.kubernetes.actions.TestActions.imagePull;
 import static oracle.weblogic.kubernetes.actions.TestActions.imagePush;
 import static oracle.weblogic.kubernetes.actions.TestActions.imageTag;
+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.ImageUtils.createBaseRepoSecret;
 import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
 import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
@@ -152,7 +155,9 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
   @Test
   @Order(1)
   public void testInstallOperator() {
+    String backupReports = backupReports(UniqueName.uniqueName(this.getClass().getSimpleName()));    
     execTestScriptAndAssertSuccess("-oper", "Failed to run -oper");
+    restoreReports(backupReports);
   }
 
   /**

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonTestUtils.java

@@ -61,6 +61,7 @@
 import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
 import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.APP_DIR;
+import static oracle.weblogic.kubernetes.actions.ActionConstants.ITTESTS_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.REMOTECONSOLE;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.REMOTECONSOLE_DOWNLOAD_FILENAME_DEFAULT;
@@ -77,6 +78,7 @@
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WLE;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WLE_DOWNLOAD_FILENAME_DEFAULT;
 import static oracle.weblogic.kubernetes.actions.ActionConstants.WLE_DOWNLOAD_URL_DEFAULT;
+import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
 import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
 import static oracle.weblogic.kubernetes.actions.TestActions.getPodCreationTimestamp;
 import static oracle.weblogic.kubernetes.actions.TestActions.getServiceNodePort;
@@ -1938,4 +1940,33 @@ public static String getImageRepoFromImageName(String imageName) {
     }
     return imageRepo;
   }
+  
+  /**
+   * Backup failsafe-reports directory to a temporary location.
+   *
+   * @param uniqueDir directory to save reports
+   * @return absolute path of the reports directory
+   */
+  public static String backupReports(String uniqueDir) {
+    String srcContents = ITTESTS_DIR + "/target/failsafe-reports/*";
+    String dstDir = WORK_DIR + "/" + uniqueDir;
+    CommandParams params = new CommandParams().defaults();
+    Command.withParams(params.command("ls -lrt " + srcContents)).execute();
+    Command.withParams(params.command("mkdir -p " + dstDir)).execute();
+    Command.withParams(params.command("cp " + srcContents + " " + dstDir)).execute();
+    return dstDir;
+  }
+
+  /**
+   * Restore reports from backup.
+   *
+   * @param backupDir directory containing the reports
+   */
+  public static void restoreReports(String backupDir) {
+    String dstDir = ITTESTS_DIR + "/target/failsafe-reports";
+    CommandParams params = new CommandParams().defaults();
+    Command.withParams(params.command("mkdir -p " + dstDir)).execute();
+    Command.withParams(params.command("cp " + backupDir + "/* " + dstDir)).execute();
+  }
+  
 }