address review comments

Author: vanajamukkara

integration-tests/README.md

@@ -212,7 +212,7 @@ The tests accepts optional env var overrides:
 | QUICKTEST  | When set to "true", limits testing to a subset of the tests. |
 | WERCKER    | Set to true if invoking from Wercker, set to false or "" if running stand-alone or from Jenkins. Default is "". |
 | JENKINS    | Set to true if invoking from Jenkins, set to false or "" if running stand-alone or from Wercker. Default is "". |
-| NODEPORT_HOST | DNS name of a Kubernetes worker node. Default is the local host's hostname. |
+| K8S_NODEPORT_HOST | DNS name of a Kubernetes worker node. Default is the local host's hostname. |
 | BRANCH_NAME  | Git branch name.   Default is determined by calling 'git branch'. |
 | LEASE_ID   |   Set to a unique value to (A) periodically renew a lease on the k8s cluster that indicates that no other test run should attempt to use the cluster, and (B) delete this lease when the test completes. |
 

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

@@ -331,13 +331,6 @@ public void testClusterScaling(Operator operator, Domain domain) throws Exceptio
         break;
       }
     }
-    // Debug for https://bug.oraclecorp.com/pls/bug/webbug_edit.edit_info_top?rptno=29325139
-    logger.info("***************Adding debug**************");
-    ExecResult result = ExecCommand.exec("kubectl describe service -n " + domainNS);
-    logger.info("kubectl describe service outpout " + result.stdout());
-
-    logger.info("***************Adding debug**************");
-
     domain.verifyWebAppLoadBalancing(TESTWEBAPP);
 
     replicas = 2;
@@ -509,15 +502,11 @@ private void copyScalingScriptToPod(
     TestUtils.createDirUnderDomainPV(dirPathToCreate);
 
     // copy script to pod
-    TestUtils.kubectlexec(
+    TestUtils.copyFileViaCat(
+        getProjectRoot() + "/src/scripts/scaling/scalingAction.sh",
+        "/shared/domains/" + domainUID + "/bin/scripts/scalingAction.sh",
         podName,
-        domainNS,
-        " -- bash -c 'cat > "
-            + "/shared/domains/"
-            + domainUID
-            + "/bin/scripts/scalingAction.sh' < "
-            + getProjectRoot()
-            + "/src/scripts/scaling/scalingAction.sh");
+        domainNS);
   }
 
   private void callWebAppAndVerifyScaling(Domain domain, int replicas) throws Exception {

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

@@ -333,27 +333,20 @@ public void deployWebAppViaWLST(
       throws Exception {
     String adminPod = domainUid + "-" + adminServerName;
 
-    String cmd =
-        " -- bash -c 'cat > " + appLocationInPod + "/" + webappName + ".war' < " + webappLocation;
-
-    TestUtils.kubectlexec(adminPod, domainNS, cmd);
+    TestUtils.copyFileViaCat(
+        webappLocation, appLocationInPod + "/" + webappName + ".war", adminPod, domainNS);
 
-    TestUtils.kubectlexec(
+    TestUtils.copyFileViaCat(
+        projectRoot + "/integration-tests/src/test/resources/deploywebapp.py",
+        appLocationInPod + "/deploywebapp.py",
         adminPod,
-        domainNS,
-        " -- bash -c 'cat > "
-            + appLocationInPod
-            + "/deploywebapp.py' < "
-            + projectRoot
-            + "/integration-tests/src/test/resources/deploywebapp.py");
-    TestUtils.kubectlexec(
+        domainNS);
+
+    TestUtils.copyFileViaCat(
+        projectRoot + "/integration-tests/src/test/resources/callpyscript.sh",
+        appLocationInPod + "/callpyscript.sh",
         adminPod,
-        domainNS,
-        " -- bash -c 'cat > "
-            + appLocationInPod
-            + "/callpyscript.sh' < "
-            + projectRoot
-            + "/integration-tests/src/test/resources/callpyscript.sh");
+        domainNS);
 
     callShellScriptByExecToPod(username, password, webappName, appLocationInPod);
   }

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

@@ -305,6 +305,14 @@ public static void kubectlcp(
     }
   }
 
+  public static void copyFileViaCat(
+      String srcFileOnHost, String destLocationInPod, String podName, String namespace)
+      throws Exception {
+
+    TestUtils.kubectlexec(
+        podName, namespace, " -- bash -c 'cat > " + destLocationInPod + "' < " + srcFileOnHost);
+  }
+
   public static ExecResult kubectlexecNoCheck(String podName, String namespace, String scriptPath)
       throws Exception {