push image to ocir for pod restart test

Author: vanajamukkara

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

@@ -200,11 +200,38 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
               + domain.getDomainUid()
               + "  Image property: store/oracle/weblogic:12.2.1.3 to store/oracle/weblogic:duplicate");
 
-      TestUtils.exec("docker tag store/oracle/weblogic:12.2.1.3 store/oracle/weblogic:duplicate");
-      domain.verifyDomainServerPodRestart(
-          "\"store/oracle/weblogic:12.2.1.3\"", "\"store/oracle/weblogic:duplicate\"");
+      if (BaseTest.SHARED_CLUSTER) {
+        String newImage =
+            System.getenv("REPO_REGISTRY") + "/weblogick8s/store/oracle/weblogic:duplicate";
+
+        // tag image with repo name
+        TestUtils.exec("docker tag store/oracle/weblogic:12.2.1.3 " + newImage);
+
+        // 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(
+            "\"store/oracle/weblogic:12.2.1.3\"", "\"" + newImage + "\"");
+      } else {
+        TestUtils.exec("docker tag store/oracle/weblogic:12.2.1.3 store/oracle/weblogic:duplicate");
+        domain.verifyDomainServerPodRestart(
+            "\"store/oracle/weblogic:12.2.1.3\"", "\"store/oracle/weblogic:duplicate\"");
+      }
     } finally {
-      TestUtils.exec("docker rmi -f store/oracle/weblogic:duplicate");
+      if (!BaseTest.SHARED_CLUSTER) {
+        TestUtils.exec("docker rmi -f store/oracle/weblogic:duplicate");
+      }
     }
 
     logger.info("SUCCESS - " + testMethodName);

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

@@ -1095,27 +1095,13 @@ protected void callCreateDomainScript(String outputDir) throws Exception {
     logger.info("Command returned " + outputStr);
 
     if (domainMap.containsKey("domainHomeImageBase") && BaseTest.SHARED_CLUSTER) {
-      String dockerLoginAndPushCmd =
-          "docker login "
-              + System.getenv("REPO_REGISTRY")
-              + " -u "
-              + System.getenv("REPO_USERNAME")
-              + " -p \""
-              + System.getenv("REPO_PASSWORD")
-              + "\" && docker push "
-              + System.getenv("REPO_REGISTRY")
+      String image =
+          System.getenv("REPO_REGISTRY")
               + "/weblogick8s/domain-home-in-image:"
               + (System.getenv("IMAGE_TAG_WEBLOGIC") != null
                   ? System.getenv("IMAGE_TAG_WEBLOGIC")
                   : "12.2.1.3");
-      result = TestUtils.exec(dockerLoginAndPushCmd);
-      logger.info(
-          "cmd "
-              + dockerLoginAndPushCmd
-              + "\n result "
-              + result.stdout()
-              + "\n err "
-              + result.stderr());
+      TestUtils.loginAndPushImageToOCIR(image);
 
       // create ocir registry secret in the same ns as domain which is used while pulling the domain
       // image

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

@@ -1337,4 +1337,25 @@ public static void buildDeployWebServiceAppInPod(
     domain.callShellScriptToBuildDeployAppInPod(
         appName, scriptName, username, password, clusterURL, wsServiceName);
   }
+
+  public static ExecResult loginAndPushImageToOCIR(String image) throws Exception {
+    String dockerLoginAndPushCmd =
+        "docker login "
+            + System.getenv("REPO_REGISTRY")
+            + " -u "
+            + System.getenv("REPO_USERNAME")
+            + " -p \""
+            + System.getenv("REPO_PASSWORD")
+            + "\" && docker push "
+            + image;
+    ExecResult result = TestUtils.exec(dockerLoginAndPushCmd);
+    logger.info(
+        "cmd "
+            + dockerLoginAndPushCmd
+            + "\n result "
+            + result.stdout()
+            + "\n err "
+            + result.stderr());
+    return result;
+  }
 }

src/integration-tests/bash/cleanup.sh

@@ -351,11 +351,7 @@ if [ "${DELETE_FILES:-true}" = "true" ]; then
 
   echo @@ Launching run to delete all pv contents.  This runs in the k8s cluster, /sharedparent mounts PV_ROOT.
   # $SCRIPTPATH/job.sh "rm -fr /scratch/acceptance_test_pv"
-  if [ "$SHARED_CLUSTER" = "true" ]; then
-	$SCRIPTPATH/job.sh "rm -fr /scratch/acceptance_test_pv"
-  else 
-  	$SCRIPTPATH/krun.sh -i openjdk:11-oracle -m "${PV_ROOT}:/sharedparent" -c 'rm -fr /sharedparent/acceptance_test_pv'
-  fi
+  $SCRIPTPATH/krun.sh -i openjdk:11-oracle -m "${PV_ROOT}:/sharedparent" -c 'rm -fr /sharedparent/acceptance_test_pv'
   [ "$?" = "0" ] || SUCCESS="1"
   echo @@ SUCCESS=$SUCCESS