candidate of fixing external Jenkins failure

Author: maggiehe00

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

@@ -121,7 +121,7 @@ private static void destroyPodsRestartdomain() throws Exception {
    *
    * @throws Exception exception
    */
-  //@Test
+  @Test
   public void testServerPodsRestartByChangingEnvProperty() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -144,7 +144,7 @@ public void testServerPodsRestartByChangingEnvProperty() throws Exception {
    *
    * @throws Exception exception
    */
-  //@Test
+  @Test
   public void testServerPodsRestartByChangingLogHomeEnabled() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -166,7 +166,7 @@ public void testServerPodsRestartByChangingLogHomeEnabled() throws Exception {
    *
    * @throws Exception exception
    */
-  //@Test
+  @Test
   public void testServerPodsRestartByChangingImagePullPolicy() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -189,7 +189,7 @@ public void testServerPodsRestartByChangingImagePullPolicy() throws Exception {
    *
    * @throws Exception exception
    */
-  //@Test
+  @Test
   public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -219,7 +219,7 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
 
-    try {
+    //try {
       TestUtils.exec("docker images", true);
       logger.info(
           "About to verifyDomainServerPodRestart for Domain: "
@@ -228,21 +228,20 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
               + getWeblogicImageName()
               + ":"
               + getWeblogicImageTag()
-              + " to "
-              + "/weblogick8s/middleware/weblogic:duplicate");
+              );
 
-      if (BaseTest.SHARED_CLUSTER) {
-        /*String newImage =
+     /*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);*/
+        TestUtils.exec("docker images", true);
       	String newImage = getWeblogicImageServer()+ "/middleware/weblogic:12.2.1.3-dev";
 
         // login and push image to ocir
-        /*TestUtils.loginAndPushImageToOcir(newImage);
+        TestUtils.loginAndPushImageToOcir(newImage);
 
         // create ocir registry secret in the same ns as domain which is used while pulling the
         // image
@@ -253,13 +252,14 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
             System.getenv("REPO_PASSWORD"),
             System.getenv("REPO_EMAIL"),
             domain.getDomainNs());*/
-
+        
+        String newImage = getWeblogicImageServer()+ "/middleware/weblogic:12.2.1.3-dev";
         // apply new domain yaml and verify pod restart
         domain.verifyDomainServerPodRestart(
             "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
             "\"" + newImage + "\"");
 
-      } else {
+     /* } else {
         TestUtils.exec(
             "docker tag "
                 + getWeblogicImageName()
@@ -276,7 +276,7 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
       if (!BaseTest.SHARED_CLUSTER) {
         TestUtils.exec("docker rmi -f " + getWeblogicImageName() + ":duplicate");
       }
-    }
+    }*/
 
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -290,7 +290,7 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
    *     are not restarted or after restart the server yaml file doesn't include the new added
    *     property
    */
-  //@Test
+  @Test
   public void testServerPodsRestartByChangingContSecurityContext() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -327,7 +327,7 @@ public void testServerPodsRestartByChangingContSecurityContext() throws Exceptio
    *     are not restarted or after restart the server yaml file doesn't include the new added
    *     property
    */
-  //@Test
+  @Test
   public void testServerPodsRestartByChangingPodSecurityContext() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -365,7 +365,7 @@ public void testServerPodsRestartByChangingPodSecurityContext() throws Exception
    *     are not restarted or after restart the server yaml file doesn't include the new added
    *     property
    */
-  //@Test
+  @Test
   public void testServerPodsRestartByChangingResource() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -446,7 +446,7 @@ public void testAdminServerRestartVersion() throws Exception {
    * @throws Exception when domain.yaml cannot be read or modified to include the
    *     restartVersion:v1.1
    */
-  //@Test
+  @Test
   public void testClusterRestartVersion() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -493,7 +493,7 @@ public void testClusterRestartVersion() throws Exception {
    * @throws Exception when domain.yaml cannot be read or modified to include the
    *     restartVersion:v1.1
    */
-  // @Test
+  @Test
   public void testMsRestartVersion() throws Exception {
     Assume.assumeTrue(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();