use fields to use values from OperatorIT.properties instead of hardcoding

Author: sankarpn

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

@@ -69,6 +69,8 @@ public class BaseTest {
   protected static String appLocationInPod = "/u01/oracle/apps";
   private static String appLocationOnHost;
   private static Properties appProps;
+  private static String imageTag;
+  private static String imageName;
 
   // Set QUICKTEST env var to true to run a small subset of tests.
   // Set SMOKETEST env var to true to run an even smaller subset of tests
@@ -104,6 +106,8 @@ public static void initialize(String appPropsFile) throws Exception {
     }
     username = appProps.getProperty("username", username);
     password = appProps.getProperty("password", password);
+    imageTag = appProps.getProperty("weblogicImageTag");
+    imageName = appProps.getProperty("weblogicImageName");
     maxIterationsPod =
         new Integer(appProps.getProperty("maxIterationsPod", "" + maxIterationsPod)).intValue();
     waitTimePod = new Integer(appProps.getProperty("waitTimePod", "" + waitTimePod)).intValue();
@@ -227,6 +231,23 @@ public static void initialize(String appPropsFile) throws Exception {
     logger.info("Env var BRANCH_NAME " + System.getenv("BRANCH_NAME"));
   }
 
+  /**
+   * getter method for imageTag field
+   *
+   * @return image tag of the WLS docker images
+   */
+  public static String getImageTag() {
+    return imageTag;
+  }
+
+  /**
+   * getter method for imageName
+   *
+   * @return image name of the WLS docker image
+   */
+  public static String getImageName() {
+    return imageName;
+  }
   /**
    * Call the basic usecases tests
    *

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

@@ -199,16 +199,18 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
       logger.info(
           "About to verifyDomainServerPodRestart for Domain: "
               + domain.getDomainUid()
-              + "  Image property: container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111 to container-registry.oracle.com/middleware/weblogic:duplicate");
+              + "  Image property: "
+              + getImageName()
+              + ":"
+              + getImageTag()
+              + " to /weblogick8s/middleware/weblogic:duplicate");
 
       if (BaseTest.SHARED_CLUSTER) {
         String newImage =
             System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
 
         // tag image with repo name
-        TestUtils.exec(
-            "docker tag container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111 "
-                + newImage);
+        TestUtils.exec("docker tag " + getImageName() + ":" + getImageTag() + " " + newImage);
 
         // login and push image to ocir
         TestUtils.loginAndPushImageToOCIR(newImage);
@@ -225,18 +227,23 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
 
         // apply new domain yaml and verify pod restart
         domain.verifyDomainServerPodRestart(
-            "\"container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111\"",
-            "\"" + newImage + "\"");
+            "\"" + getImageName() + ":" + getImageTag() + "\"", "\"" + newImage + "\"");
       } else {
         TestUtils.exec(
-            "docker tag container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111 container-registry.oracle.com/middleware/weblogic:duplicate");
+            "docker tag "
+                + getImageName()
+                + ":"
+                + getImageTag()
+                + " "
+                + getImageName()
+                + ":duplicate");
         domain.verifyDomainServerPodRestart(
-            "\"container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111\"",
-            "\"container-registry.oracle.com/middleware/weblogic:duplicate\"");
+            "\"" + getImageName() + ":" + getImageTag() + "\"",
+            "\"" + getImageName() + ":duplicate" + "\"");
       }
     } finally {
       if (!BaseTest.SHARED_CLUSTER) {
-        TestUtils.exec("docker rmi -f container-registry.oracle.com/middleware/weblogic:duplicate");
+        TestUtils.exec("docker rmi -f " + getImageName() + ":duplicate");
       }
     }
 

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

@@ -61,8 +61,8 @@ public class Domain {
   protected String userProjectsDir = "";
   private String projectRoot = "";
   private boolean ingressPerDomain = true;
-  private String imageTag = "12.2.1.3";
-  private String imageName = "middleware/weblogic";
+  private String imageTag;
+  private String imageName;
 
   protected String generatedInputYamlFile;
 
@@ -1384,6 +1384,8 @@ private void callWebAppAndCheckForServerNameInResponse(
    *     accessed to read or if creating config map or secret fails for configoverrides
    */
   protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
+    imageTag = BaseTest.getImageTag();
+    imageName = BaseTest.getImageName();
     domainMap = inputDomainMap;
     this.userProjectsDir = BaseTest.getUserProjectsDir();
     this.projectRoot = BaseTest.getProjectRoot();

integration-tests/src/test/resources/OperatorIT.properties

@@ -7,3 +7,5 @@ username=weblogic
 password=welcome1
 maxIterationsPod=25
 waitTimePod=10
+weblogicImageTag = 12.2.1.3-190111
+weblogicImageName = container-registry.oracle.com/middleware/weblogic