fix

Author: sankarpn

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

@@ -197,22 +197,27 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
     logTestBegin(testMethodName);
 
     try {
+      ExecAndPrintLog("docker images");
       logger.info(
           "About to verifyDomainServerPodRestart for Domain: "
               + domain.getDomainUid()
               + "  Image property: "
               + getWeblogicImageName()
               + ":"
               + getWeblogicImageTag()
-              + " to /weblogick8s/middleware/weblogic:duplicate");
+              + " to "
+              + System.getenv("REPO_REGISTRY")
+              + "/weblogick8s/middleware/weblogic:duplicate");
 
       if (BaseTest.SHARED_CLUSTER) {
         String newImage =
             System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
 
+        String tag =
+            "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage;
         // tag image with repo name
-        TestUtils.exec(
-            "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage);
+        ExecAndPrintLog(tag);
+        ExecAndPrintLog("docker images");
 
         // login and push image to ocir
         TestUtils.loginAndPushImageToOCIR(newImage);
@@ -230,26 +235,15 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
         String command =
             "kubectl create secret docker-registry docker-store "
                 + "--docker-server="
-                + BaseTest.getWeblogicImageServer()
+                + System.getenv("REPO_REGISTRY")
                 + " --docker-username="
-                + System.getenv("OCR_USERNAME")
+                + System.getenv("REPO_USERNAME")
                 + " --docker-password="
-                + System.getenv("OCR_PASSWORD")
+                + System.getenv("REPO_PASSWORD")
                 + " -n "
                 + domain.getDomainNS()
                 + " --dry-run -o yaml | kubectl apply -f - ";
-
-        logger.info("Executing " + command);
-        ExecResult result = ExecCommand.exec(command);
-        logger.info(
-            "Command "
-                + command
-                + " return value "
-                + result.exitValue()
-                + " \n failed with stderr = "
-                + result.stderr()
-                + " \n stdout = "
-                + result.stdout());
+        ExecAndPrintLog(command);
 
         // apply new domain yaml and verify pod restart
         domain.verifyDomainServerPodRestart(
@@ -277,6 +271,19 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
     logger.info("SUCCESS - " + testMethodName);
   }
 
+  private void ExecAndPrintLog(String command) throws Exception {
+    ExecResult result = ExecCommand.exec(command);
+    logger.info(
+        "Command "
+            + command
+            + "\nreturn value: "
+            + result.exitValue()
+            + "\nstderr = "
+            + result.stderr()
+            + "\nstdout = "
+            + result.stdout());
+  }
+
   /**
    * Modify/Add the containerSecurityContext section at ServerPod Level using kubectl apply -f
    * cont.security.context.domain.yaml. Verify all the pods re-started. The property tested is:

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

@@ -386,10 +386,10 @@ public void deployWebAppViaREST(
         .append("/management/weblogic/latest/edit/appDeployments")
         .append(" --write-out %{http_code} ");
     logger.info("Command to deploy webapp " + cmd);
+    logger.info(getHostNameForCurl());
     ExecResult result = TestUtils.exec(cmd.toString());
     String output = result.stdout().trim();
     logger.info("curl output " + output + " \n err " + result.stderr());
-    logger.info(getHostNameForCurl());
     if (!output.contains("202")) {
       throw new RuntimeException("FAILURE: Webapp deployment failed with response code " + output);
     }