use krun.sh to copy files and create dir on pv

Author: vanajamukkara

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

@@ -6,6 +6,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.Map;
 import java.util.Properties;
 import java.util.logging.FileHandler;
@@ -672,14 +673,7 @@ public void testWldfScaling(Operator operator, Domain domain) throws Exception {
     String adminPodName = domainUid + "-" + adminServerName;
     String domainName = (String) domainMap.get("domainName");
 
-    String scriptsDir =
-        "/scratch/acceptance_test_pv/persistentVolume-"
-            + domainUid
-            + "/domains/"
-            + domainUid
-            + "/bin/scripts";
-
-    copyScalingScriptToPod(scriptsDir, domainUid, adminPodName, domainNS);
+    copyScalingScriptToPod( domainUid, adminPodName, domainNS);
     TestUtils.createRbacPoliciesForWldfScaling();
 
     // deploy opensessionapp
@@ -737,18 +731,23 @@ protected void logTestBegin(String testName) throws Exception {
     TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
   }
 
-  private void copyScalingScriptToPod(
-      String dirPathToCreate, String domainUid, String podName, String domainNS) throws Exception {
+  private void copyScalingScriptToPod(String domainUid, String podName, String domainNS)
+      throws Exception {
+
+    String pvDir = BaseTest.getPvRoot() + "/acceptance_test_pv/persistentVolume-" + domainUid;
+    String scriptsDir = pvDir + "/domains/" + domainUid + "/bin/scripts";
 
     // create scripts dir under domain pv
-    TestUtils.createDirUnderDomainPV(dirPathToCreate);
-
+    TestUtils.createDirUnderDomainPV(scriptsDir);
+    // workaround for the issue with not allowing .. in the host-path in krun.sh
+    Files.copy(Paths.get(getProjectRoot() + "/src/scripts/scaling/scalingAction.sh"),
+        Paths.get(getResultDir()+"/scalingAction.sh"), StandardCopyOption.REPLACE_EXISTING);
     // copy script to pod
-    TestUtils.copyFileViaCat(
-        getProjectRoot() + "/src/scripts/scaling/scalingAction.sh",
-        "/shared/domains/" + domainUid + "/bin/scripts/scalingAction.sh",
-        podName,
-        domainNS);
+    String cpUsingKrunCmd = getProjectRoot() + "/src/integration-tests/bash/krun.sh -m "
+        + getResultDir() + ":/tmpdir -m " + pvDir
+        + ":/pvdir -c 'cp -f /tmpdir/scalingAction.sh /pvdir/domains/domainonpvwdt/bin/scripts' -n "
+        + domainNS;
+    TestUtils.exec(cpUsingKrunCmd, true);
   }
 
   private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exception {

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -938,7 +938,7 @@ protected void createPv() throws Exception {
     pvMap.values().removeIf(Objects::isNull);
 
     // k8s job mounts PVROOT /scratch/<usr>/wl_k8s_test_results to /scratch, create PV/PVC
-    new PersistentVolume("acceptance_test_pv/persistentVolume-" + domainUid, pvMap);
+    new PersistentVolume(BaseTest.getPvRoot() +"acceptance_test_pv/persistentVolume-" + domainUid, pvMap);
 
     String cmd =
         BaseTest.getProjectRoot()

integration-tests/src/test/java/oracle/kubernetes/operator/utils/PersistentVolume.java

@@ -21,23 +21,14 @@ public class PersistentVolume {
   public PersistentVolume(String dirPath, Map pvMap) throws Exception {
     this.dirPath = dirPath;
     this.pvMap = pvMap;
-
+    
     String cmd =
             BaseTest.getProjectRoot()
-        + "/src/integration-tests/bash/krun.sh -m "+BaseTest.getPvRoot()+":/sharedparent -c 'mkdir -m 777 -p /sharedparent/"
-        + dirPath
+        + "/src/integration-tests/bash/krun.sh -m "+BaseTest.getPvRoot()+":/sharedparent -c 'mkdir -m 777 -p "
+        + dirPath.replace(BaseTest.getPvRoot(), "/sharedparent/")
         + "'"; 
-
-    ExecResult result = ExecCommand.exec(cmd);
-    if (result.exitValue() != 0) {
-      throw new RuntimeException(
-          "FAILURE: command to create domain PV directory "
-              + cmd
-              + " failed, returned "
-              + result.stdout()
-              + result.stderr());
-    }
-    logger.info("command result " + result.stdout().trim());
+    
+    TestUtils.exec(cmd, true);
 
     Path parentDir =
         pvMap.get("domainUID") != null
@@ -60,16 +51,7 @@ public PersistentVolume(String dirPath, Map pvMap) throws Exception {
             + BaseTest.getUserProjectsDir();
     logger.info("Executing cmd " + cmdPvPvc);
 
-    result = ExecCommand.exec(cmdPvPvc);
-    if (result.exitValue() != 0) {
-      throw new RuntimeException(
-          "FAILURE: command to create PV/PVC "
-              + cmdPvPvc
-              + " failed, returned "
-              + result.stdout()
-              + result.stderr());
-    }
-    logger.info("command result " + result.stdout().trim());
+    TestUtils.exec(cmdPvPvc, true);
   }
 
   public String getDirPath() {

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -1022,12 +1022,13 @@ public static void callShellScriptByExecToPod(
   }
 
   public static void createDirUnderDomainPV(String dirPath) throws Exception {
-
+    dirPath = dirPath.replace(BaseTest.getPvRoot(), "/sharedparent/");
     String crdCmd =
         BaseTest.getProjectRoot()
-            + "/src/integration-tests/bash/job.sh \"mkdir -p "
-            + dirPath
-            + "\"";
+     + "/src/integration-tests/bash/krun.sh -m "+BaseTest.getPvRoot()+":/sharedparent -c 'mkdir -m 777 -p "
+     + dirPath
+     + "'"; 
+    
     ExecResult result = ExecCommand.exec(crdCmd);
     if (result.exitValue() != 0) {
       throw new RuntimeException(
@@ -1046,31 +1047,33 @@ public static void createWldfModule(String adminPodName, String domainNS, int t3
     // copy wldf.py script tp pod
     copyFileViaCat(
         BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/wldf/wldf.py",
-        "/shared/wldf.py",
+        BaseTest.getAppLocationInPod() +"/wldf.py",
         adminPodName,
         domainNS);
 
     // copy callpyscript.sh to pod
     copyFileViaCat(
         BaseTest.getProjectRoot() + "/integration-tests/src/test/resources/callpyscript.sh",
-        "/shared/callpyscript.sh",
+        BaseTest.getAppLocationInPod() + "/callpyscript.sh",
         adminPodName,
         domainNS);
 
     // arguments to shell script to call py script
-    String arguments =
-        "/shared/wldf.py "
-            + BaseTest.getUsername()
-            + " "
-            + BaseTest.getPassword()
-            + " t3://"
+
+    String[] args = {
+        BaseTest.getAppLocationInPod() + "/wldf.py",
+        BaseTest.getUsername(),
+        BaseTest.getPassword(),
+        " t3://"
             + adminPodName
             + ":"
-            + t3ChannelPort;
-
+            + t3ChannelPort,
+        
+      };
+    
     // call callpyscript.sh in pod to deploy wldf module
-    TestUtils.callShellScriptByExecToPod(
-        "/shared/callpyscript.sh", arguments, adminPodName, domainNS);
+     TestUtils.callShellScriptByExecToPod(
+        adminPodName, domainNS, BaseTest.getAppLocationInPod(), "callpyscript.sh", args);
   }
 
   public static void createRbacPoliciesForWldfScaling() throws Exception {