debugging on external Jenkins

Author: maggiehe00

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 weblogicImageTag field.
+   *
+   * @return image tag of the WLS docker images
+   */
+  public static String getWeblogicImageDevTag() {
+    return weblogicImageDevTag;
+  }
 
   /**
    * getter method for weblogicImageName.

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

@@ -229,16 +229,16 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
               + " to "
               + "/weblogick8s/middleware/weblogic:duplicate");
 
-      String newImage = getWeblogicImageServer()+ "/middleware/weblogic:12.2.1.3-dev";
+      /*String newImage = getWeblogicImageName() + ":" + getWeblogicImageDevTag();
       TestUtils.exec("docker pull " + newImage, true);
       // apply new domain yaml and verify pod restart
       domain.verifyDomainServerPodRestart(
           "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
-          "\"" + newImage + "\"");
+          "\"" + newImage + "\"");*/
 
-      /*if (BaseTest.SHARED_CLUSTER) {
+      if (BaseTest.SHARED_CLUSTER) {
         String newImage =
-            System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
+            System.getenv("REPO_REGISTRY") + "/middleware/weblogic:duplicate";
         // tag image with repo name
         String tag =
             "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage;
@@ -257,6 +257,9 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
             System.getenv("REPO_PASSWORD"),
             System.getenv("REPO_EMAIL"),
             domain.getDomainNs());
+        
+        //for debugging
+        TestUtils.loginAndPullImageFromOcir(newImage);
 
         // apply new domain yaml and verify pod restart
         domain.verifyDomainServerPodRestart(
@@ -275,7 +278,7 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
         domain.verifyDomainServerPodRestart(
             "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
             "\"" + getWeblogicImageName() + ":duplicate" + "\"");
-      }*/
+      }
     } finally {
       if (!BaseTest.SHARED_CLUSTER) {
         TestUtils.exec("docker rmi -f " + getWeblogicImageName() + ":duplicate");

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

@@ -1482,6 +1482,28 @@ public static ExecResult loginAndPushImageToOcir(String image) throws Exception
             + result.stderr());
     return result;
   }
+  
+  public static ExecResult loginAndPullImageFromOcir(String image) throws Exception {
+    String dockerLoginAndPullCmd =
+        "docker login "
+            + System.getenv("REPO_REGISTRY")
+            + " -u "
+            + System.getenv("REPO_USERNAME")
+            + " -p \""
+            + System.getenv("REPO_PASSWORD")
+            + "\" && docker pull "
+            + image;
+    ExecResult result = TestUtils.exec(dockerLoginAndPullCmd);
+    logger.info(
+        "cmd "
+            + dockerLoginAndPushCmd
+            + "\n result "
+            + result.stdout()
+            + "\n err "
+            + result.stderr());
+    return result;
+  }
+
 
   public static ExecResult kubectlpatch(String domainUid, String domainNS, String patchStr)
       throws Exception {

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

@@ -8,7 +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
 DOMAIN_API_VERSION = weblogic.oracle/v4
-