create PV_ROOT and RESULT_ROOT dirs in initialize

Author: vanajamukkara

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -136,6 +136,28 @@ public static void initialize(String appPropsFile) throws Exception {
               + "\n"
               + clnResult.stderr());
     }
+
+    if (System.getenv("JENKINS") != null) {
+      logger.info("Creating " + resultRoot + "/acceptance_test_tmp");
+      TestUtils.exec(
+          "/usr/local/packages/aime/ias/run_as_root \"mkdir -p "
+              + resultRoot
+              + "/acceptance_test_tmp\"");
+      TestUtils.exec(
+          "/usr/local/packages/aime/ias/run_as_root \"chmod 777 "
+              + resultRoot
+              + "/acceptance_test_tmp\"");
+      logger.info("Creating " + pvRoot + "/acceptance_test_pv");
+      TestUtils.exec(
+          "/usr/local/packages/aime/ias/run_as_root \"mkdir -p "
+              + pvRoot
+              + "/acceptance_test_pv\"");
+      TestUtils.exec(
+          "/usr/local/packages/aime/ias/run_as_root \"chmod 777 "
+              + pvRoot
+              + "/acceptance_test_pv\"");
+    }
+
     // create resultRoot, PVRoot, etc
     Files.createDirectories(Paths.get(resultRoot));
     Files.createDirectories(Paths.get(resultDir));
@@ -561,4 +583,29 @@ private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exce
       TestUtils.checkServiceCreated(podName, domainNS);
     }
   }
+
+  public static void tearDown() throws Exception {
+    StringBuffer cmd =
+        new StringBuffer("export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && ");
+    cmd.append(BaseTest.getProjectRoot())
+        .append("/integration-tests/src/test/resources/statedump.sh");
+    logger.info("Running " + cmd);
+
+    ExecResult result = ExecCommand.exec(cmd.toString());
+    if (result.exitValue() == 0) {
+      logger.info("Executed statedump.sh " + result.stdout());
+    } else {
+      logger.info("Execution of statedump.sh failed, " + result.stderr() + "\n" + result.stdout());
+    }
+
+    // if (JENKINS) {
+    result = cleanup();
+    logger.info("cleanup result =" + result.stdout() + "\n " + result.stderr());
+    // }
+
+    if (getLeaseId() != "") {
+      logger.info("Release the k8s cluster lease");
+      TestUtils.releaseLease(getProjectRoot(), getLeaseId());
+    }
+  }
 }

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -6,8 +6,6 @@
 
 import java.util.Map;
 import oracle.kubernetes.operator.utils.Domain;
-import oracle.kubernetes.operator.utils.ExecCommand;
-import oracle.kubernetes.operator.utils.ExecResult;
 import oracle.kubernetes.operator.utils.Operator;
 import oracle.kubernetes.operator.utils.Operator.RESTCertType;
 import oracle.kubernetes.operator.utils.TestUtils;
@@ -56,25 +54,7 @@ public static void staticUnPrepare() throws Exception {
     logger.info("BEGIN");
     logger.info("Run once, release cluster lease");
 
-    StringBuffer cmd =
-        new StringBuffer("export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && ");
-    cmd.append(BaseTest.getProjectRoot())
-        .append("/integration-tests/src/test/resources/statedump.sh");
-    logger.info("Running " + cmd);
-
-    ExecResult result = ExecCommand.exec(cmd.toString());
-    if (result.exitValue() == 0) logger.info("Executed statedump.sh " + result.stdout());
-    else
-      logger.info("Execution of statedump.sh failed, " + result.stderr() + "\n" + result.stdout());
-
-    if (JENKINS) {
-      cleanup();
-    }
-
-    if (getLeaseId() != "") {
-      logger.info("Release the k8s cluster lease");
-      TestUtils.releaseLease(getProjectRoot(), getLeaseId());
-    }
+    tearDown();
 
     logger.info("SUCCESS");
   }

integration-tests/src/test/java/oracle/kubernetes/operator/ITUsabilityOperatorHelmChart.java

@@ -56,26 +56,7 @@ public static void staticUnPrepare() throws Exception {
       logger.info("BEGIN");
       logger.info("Run once, release cluster lease");
 
-      StringBuffer cmd =
-          new StringBuffer("export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && ");
-      cmd.append(BaseTest.getProjectRoot())
-          .append("/integration-tests/src/test/resources/statedump.sh");
-      logger.info("Running " + cmd);
-
-      ExecResult result = ExecCommand.exec(cmd.toString());
-      if (result.exitValue() == 0) logger.info("Executed statedump.sh " + result.stdout());
-      else
-        logger.info(
-            "Execution of statedump.sh failed, " + result.stderr() + "\n" + result.stdout());
-
-      if (JENKINS) {
-        cleanup();
-      }
-
-      if (getLeaseId() != "") {
-        logger.info("Release the k8s cluster lease");
-        TestUtils.releaseLease(getProjectRoot(), getLeaseId());
-      }
+      tearDown();
 
       logger.info("SUCCESS");
     }