use TestUtil.exec() for command exec

Author: [email protected]

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

@@ -84,10 +84,10 @@ public void testServerPodsRestartByChangingEnvProperty() throws Exception {
 
     boolean testCompletedSuccessfully = false;
     logger.info(
-        "About to testDomainServerRestart for Domain: "
+        "About to testDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + "  env property: StdoutDebugEnabled=false to StdoutDebugEnabled=true");
-    domain.testDomainServerRestart(
+    domain.testDomainServerPodRestart(
         "\"-Dweblogic.StdoutDebugEnabled=false\"", "\"-Dweblogic.StdoutDebugEnabled=true\"");
 
     logger.info("SUCCESS - " + testMethodName);
@@ -107,10 +107,10 @@ public void testServerPodsRestartByChangingLogHomeEnabled() throws Exception {
     boolean testCompletedSuccessfully = false;
 
     logger.info(
-        "About to testDomainServerRestart for Domain: "
+        "About to testDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + "  logHomeEnabled: true -->  logHomeEnabled: false");
-    domain.testDomainServerRestart("logHomeEnabled: true", "logHomeEnabled: false");
+    domain.testDomainServerPodRestart("logHomeEnabled: true", "logHomeEnabled: false");
 
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -129,10 +129,10 @@ public void testServerPodsRestartByChangingImagePullPolicy() throws Exception {
     boolean testCompletedSuccessfully = false;
 
     logger.info(
-        "About to testDomainServerRestart for Domain: "
+        "About to testDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + " imagePullPolicy: IfNotPresent -->  imagePullPolicy: Never ");
-    domain.testDomainServerRestart(
+    domain.testDomainServerPodRestart(
         "imagePullPolicy: \"IfNotPresent\"", "imagePullPolicy: \"Never\" ");
 
     logger.info("SUCCESS - " + testMethodName);
@@ -152,10 +152,10 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
     boolean testCompletedSuccessfully = false;
 
     logger.info(
-        "About to testDomainServerRestart for Domain: "
+        "About to testDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + "  includeServerOutInPodLog: true -->  includeServerOutInPodLog: false");
-    domain.testDomainServerRestart(
+    domain.testDomainServerPodRestart(
         "includeServerOutInPodLog: true", "includeServerOutInPodLog: false");
 
     logger.info("SUCCESS - " + testMethodName);
@@ -176,11 +176,11 @@ public void testServerPodsRestartByChangingImage() throws Exception {
     boolean testCompletedSuccessfully = false;
     try {
       logger.info(
-          "About to testDomainServerRestart for Domain: "
+          "About to testDomainServerPodRestart for Domain: "
               + domain.getDomainUid()
               + "  Image property: store/oracle/weblogic:12.2.1.3 to store/oracle/weblogic:duplicate");
       TestUtils.dockerTagImage("store/oracle/weblogic:12.2.1.3", "store/oracle/weblogic:duplicate");
-      domain.testDomainServerRestart(
+      domain.testDomainServerPodRestart(
           "\"store/oracle/weblogic:12.2.1.3\"", "\"store/oracle/weblogic:duplicate\"");
     } finally {
       TestUtils.dockerRemoveImage("store/oracle/weblogic:duplicate");

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

@@ -850,7 +850,7 @@ private void createPV() throws Exception {
     new PersistentVolume("/scratch/acceptance_test_pv/persistentVolume-" + domainUid, pvMap);
   }
 
-  public void testDomainServerRestart(String oldPropertyString, String newPropertyString)
+  public void testDomainServerPodRestart(String oldPropertyString, String newPropertyString)
       throws Exception {
     logger.info("Inside testDomainServerPodRestart");
     String content =

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

@@ -1110,31 +1110,13 @@ public static void dockerTagImage(String sourceImage, String targetImage) throws
     logger.info("Tagging souceImage:  " + sourceImage + "  to " + targetImage);
     String dockerCmd = "docker tag " + sourceImage + " " + targetImage;
     logger.info("Executing cmd " + dockerCmd);
-
-    ExecResult result = ExecCommand.exec(dockerCmd);
-    if (result.exitValue() != 0) {
-      throw new RuntimeException(
-          "FAILURE: command to create load balancer "
-              + dockerCmd
-              + " failed, returned "
-              + result.stdout()
-              + result.stderr());
-    }
+    exec(dockerCmd);
   }
 
   public static void dockerRemoveImage(String imageName) throws Exception {
     logger.info("Removing image:  " + imageName);
     String dockerCmd = "docker rmi -f  " + imageName;
     logger.info("Executing cmd " + dockerCmd);
-
-    ExecResult result = ExecCommand.exec(dockerCmd);
-    if (result.exitValue() != 0) {
-      throw new RuntimeException(
-          "FAILURE: command to create load balancer "
-              + dockerCmd
-              + " failed, returned "
-              + result.stdout()
-              + result.stderr());
-    }
+    exec(dockerCmd);
   }
 }