remove docker tag/remove methods instead direcly use TestUtils.exec(cmd)

Author: [email protected]

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

@@ -83,7 +83,6 @@ public void testServerPodsRestartByChangingEnvProperty() throws Exception {
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
-    boolean testCompletedSuccessfully = false;
     logger.info(
         "About to testDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
@@ -107,8 +106,6 @@ public void testServerPodsRestartByChangingLogHomeEnabled() throws Exception {
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
-    boolean testCompletedSuccessfully = false;
-
     logger.info(
         "About to testDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
@@ -131,8 +128,6 @@ public void testServerPodsRestartByChangingImagePullPolicy() throws Exception {
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
-    boolean testCompletedSuccessfully = false;
-
     logger.info(
         "About to testDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
@@ -156,8 +151,6 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
-    boolean testCompletedSuccessfully = false;
-
     logger.info(
         "About to testDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
@@ -176,22 +169,22 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
    * @throws Exception
    */
   @Test
-  public void testServerPodsRestartByChangingImage() throws Exception {
+  public void testServerPodsRestartByChangingZImage() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
-    boolean testCompletedSuccessfully = false;
     try {
       logger.info(
           "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");
+
+      TestUtils.exec("docker tag store/oracle/weblogic:12.2.1.3 store/oracle/weblogic:duplicate");
       domain.testDomainServerPodRestart(
           "\"store/oracle/weblogic:12.2.1.3\"", "\"store/oracle/weblogic:duplicate\"");
     } finally {
-      TestUtils.dockerRemoveImage("store/oracle/weblogic:duplicate");
+      TestUtils.exec("docker rmi -f store/oracle/weblogic:duplicate");
     }
 
     logger.info("SUCCESS - " + testMethodName);

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

@@ -60,7 +60,12 @@ public static void checkPodCreated(String podName, String domainNS) throws Excep
     checkCmdInLoop(cmd.toString(), "Running", podName);
   }
 
-  /** @param cmd - kubectl get pod <podname> -n namespace */
+  /**
+   * check pod is in Terminating state
+   *
+   * @param cmd - kubectl get pod <podname> -n namespace
+   * @throws Exception
+   */
   public static void checkPodTerminating(String podName, String domainNS) throws Exception {
 
     StringBuffer cmd = new StringBuffer();
@@ -1067,7 +1072,15 @@ private static void checkCmdInLoopForDelete(String cmd, String matchStr, String
     }
   }
 
-  // create yaml file with changed property
+  /**
+   * create yaml file with changed property
+   *
+   * @param inputYamlFile
+   * @param generatedYamlFile
+   * @param oldString
+   * @paramnewString
+   * @throws Exception
+   */
   public static void createNewYamlFile(
       String inputYamlFile, String generatedYamlFile, String oldString, String newString)
       throws Exception {
@@ -1101,35 +1114,15 @@ public static void createNewYamlFile(
     logger.info("Done - generate the new yaml file ");
   }
 
-  public static void copyFile(String fromFile, String toFile) throws Exception {
-    logger.info("Copying file from  " + fromFile + " to " + toFile);
-
-    Files.copy(new File(fromFile).toPath(), Paths.get(toFile), StandardCopyOption.REPLACE_EXISTING);
-  }
-  /**
-   * tag image with docker cmd: docker tage sourceImageName targetImageName
-   *
-   * @param sourceImage
-   * @param targetImage
-   * @throws Exception
-   */
-  public static void dockerTagImage(String sourceImage, String targetImage) throws Exception {
-    logger.info("Tagging souceImage:  " + sourceImage + "  to " + targetImage);
-    String dockerCmd = "docker tag " + sourceImage + " " + targetImage;
-    logger.info("Executing cmd " + dockerCmd);
-    exec(dockerCmd);
-  }
-
   /**
-   * remove image with docker cmd: docker rmi -f imageName
+   * copy file from source to target
    *
-   * @param imageName
+   * @param fromFile
+   * @param toFile
    * @throws Exception
    */
-  public static void dockerRemoveImage(String imageName) throws Exception {
-    logger.info("Removing image:  " + imageName);
-    String dockerCmd = "docker rmi -f  " + imageName;
-    logger.info("Executing cmd " + dockerCmd);
-    exec(dockerCmd);
+  public static void copyFile(String fromFile, String toFile) throws Exception {
+    logger.info("Copying file from  " + fromFile + " to " + toFile);
+    Files.copy(new File(fromFile).toPath(), Paths.get(toFile), StandardCopyOption.REPLACE_EXISTING);
   }
 }