Merge branch 'develop' into initconttests

Author: sankarpn

integration-tests/README.md

@@ -232,13 +232,13 @@ The below env variables are required for SHARED_CLUSTER=true:
 
 | Variable | Description |
 | --- | --- |
-| REPO_REGISTRY | OCIR Server to push/pull the Operator image |
-| REPO_USERNAME | OCIR Username |
-| REPO_PASSWORD | OCIR token |
-| REPO_EMAIL | OCIR email |
+| REPO_REGISTRY | OCR Server to push/pull the Operator image |
+| REPO_USERNAME | OCR username |
+| REPO_PASSWORD | OCR password |
+| REPO_EMAIL | OCR e-mail |
 | DOCKER_USERNAME | Docker username to pull the Weblogic image  |
 | DOCKER_PASSWORD | Docker password |
-| DOCKER_EMAIL | Docker email |
+| DOCKER_EMAIL | Docker e-mail |
 | K8S_NODEPORT_HOST | DNS name of a Kubernetes worker node. |
 
 Successful run will have the output like below:
@@ -303,9 +303,9 @@ JUnit test results can be seen at "integration-tests/target/failsafe-reports/TES
   - And get access to FMW Infrastructure 12c Image: **_container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3_**
   - export the following before running the tests:
     ```
-    export REPO_USERNAME=<ocir_username>
-    export REPO_PASSWORD=<ocir_password>
-    export REPO_EMAIL=<ocir_email>
+    export REPO_USERNAME=<ocr_username>
+    export REPO_PASSWORD=<ocr_password>
+    export REPO_EMAIL=<ocr_email>
     ```
  
  Method 2 

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

@@ -72,6 +72,7 @@ public class BaseTest {
   private static String appLocationOnHost;
   private static Properties appProps;
   private static String weblogicImageTag;
+  private static String weblogicImageDevTag;
   private static String weblogicImageName;
   private static String weblogicImageServer;
   private static String domainApiVersion;
@@ -114,6 +115,10 @@ public static void initialize(String appPropsFile) throws Exception {
         System.getenv("IMAGE_TAG_WEBLOGIC") != null
             ? System.getenv("IMAGE_TAG_WEBLOGIC")
             : appProps.getProperty("weblogicImageTag");
+    weblogicImageDevTag =
+        System.getenv("IMAGE_DEVTAG_WEBLOGIC") != null
+            ? System.getenv("IMAGE_DEVTAG_WEBLOGIC")
+            : appProps.getProperty("weblogicImageDevTag");
     weblogicImageName =
         System.getenv("IMAGE_NAME_WEBLOGIC") != null
             ? System.getenv("IMAGE_NAME_WEBLOGIC")
@@ -257,6 +262,15 @@ public static void initialize(String appPropsFile) throws Exception {
   public static String getWeblogicImageTag() {
     return weblogicImageTag;
   }
+  
+  /**
+   * getter method for weblogicImageDevTag field.
+   *
+   * @return image tag of the WLS Dev docker images
+   */
+  public static String getWeblogicImageDevTag() {
+    return weblogicImageDevTag;
+  }
 
   /**
    * getter method for weblogicImageName.

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

@@ -206,7 +206,7 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
    * Modify the domain scope property on the domain resource using kubectl apply -f domain.yaml
    * Verify that all the server pods in the domain got re-started .The property tested is: image:
    * "container-registry.oracle.com/middleware/weblogic:12.2.1.3" --> image:
-   * "container-registry.oracle.com/middleware/weblogic:duplicate"
+   * "container-registry.oracle.com/middleware/weblogic:12.2.1.3-dev"
    *
    * @throws Exception exception
    */
@@ -216,63 +216,26 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
-    try {
-      TestUtils.exec("docker images", true);
-      logger.info(
-          "About to verifyDomainServerPodRestart for Domain: "
-              + domain.getDomainUid()
-              + "  Image property: "
-              + getWeblogicImageName()
-              + ":"
-              + getWeblogicImageTag()
-              + " to "
-              + "/weblogick8s/middleware/weblogic:duplicate");
-
-      if (BaseTest.SHARED_CLUSTER) {
-        String newImage =
-            System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
-        // tag image with repo name
-        String tag =
-            "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage;
-        TestUtils.exec(tag, true);
-        TestUtils.exec("docker images", true);
-
-        // login and push image to ocir
-        TestUtils.loginAndPushImageToOcir(newImage);
-
-        // create ocir registry secret in the same ns as domain which is used while pulling the
-        // image
-        TestUtils.createDockerRegistrySecret(
-            "docker-store",
-            System.getenv("REPO_REGISTRY"),
-            System.getenv("REPO_USERNAME"),
-            System.getenv("REPO_PASSWORD"),
-            System.getenv("REPO_EMAIL"),
-            domain.getDomainNs());
-
-        // apply new domain yaml and verify pod restart
-        domain.verifyDomainServerPodRestart(
-            "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
-            "\"" + newImage + "\"");
-
-      } else {
-        TestUtils.exec(
-            "docker tag "
-                + getWeblogicImageName()
-                + ":"
-                + getWeblogicImageTag()
-                + " "
-                + getWeblogicImageName()
-                + ":duplicate");
-        domain.verifyDomainServerPodRestart(
-            "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
-            "\"" + getWeblogicImageName() + ":duplicate" + "\"");
-      }
-    } finally {
-      if (!BaseTest.SHARED_CLUSTER) {
-        TestUtils.exec("docker rmi -f " + getWeblogicImageName() + ":duplicate");
-      }
-    }
+    
+    TestUtils.exec("docker images", true);
+    logger.info(
+        "About to verifyDomainServerPodRestart for Domain: "
+         + domain.getDomainUid()
+         + "  Image property: "
+         + getWeblogicImageName()
+         + ":"
+         + getWeblogicImageTag()
+         + " to "
+         + getWeblogicImageName()
+         + ":"
+         + getWeblogicImageDevTag());
+
+    String newImage = getWeblogicImageName() + ":" + getWeblogicImageDevTag();
+    TestUtils.exec("docker pull " + newImage, true);
+    // apply new domain yaml and verify pod restart
+    domain.verifyDomainServerPodRestart(
+        "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
+        "\"" + newImage + "\"");
 
     logger.info("SUCCESS - " + testMethodName);
   }

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

@@ -8,6 +8,7 @@ password=welcome1
 maxIterationsPod=25
 waitTimePod=10
 weblogicImageTag = 12.2.1.3
+weblogicImageDevTag = 12.2.1.3-dev
 weblogicImageName = container-registry.oracle.com/middleware/weblogic
-OCR_SERVER="container-registry.oracle.com"
+OCR_SERVER=container-registry.oracle.com
 DOMAIN_API_VERSION = weblogic.oracle/v4