fix for vanaja's comments

Author: Sankar Periyathambi Neelakandan

integration-tests/README.md

@@ -180,23 +180,21 @@ K8sTestUtils - uses k8s java client api, this is used only for delete domain use
 
 * Maven and latest Git should be in PATH
 * export JAVA_HOME
-* export WEBLOGIC_IMAGE_NAME and WEBLOGIC_IMAGE_TAG if different from middleware/weblogic and 12.2.1.3
+* export WEBLOGIC_IMAGE_NAME and WEBLOGIC_IMAGE_TAG if different from container-registry.oracle.com/middleware/weblogic and 12.2.1.3
 * Setup docker access to WebLogic 12c Images 
 
  Method 1 
-  - Setup a personal account on hub.docker.com
-  - Then sign in to hub.docker.com and signup for access to WebLogic 12c Images via https://hub.docker.com/_/oracle-weblogic-server-12c
+  - Setup a personal account on container-registry.oracle.com
+  - Then sign in to container-registry.oracle.com and signup for access to WebLogic 12.2.1.3 images from container-registry.oracle.com/middleware/weblogic:12.2.1.3
   - Then export the following before running the tests: 
 	```
-	export DOCKER_USERNAME=<docker_username>
-	export DOCKER_PASSWORD=<docker_password>
-	export DOCKER_EMAIL=<docker_email>
+	export OCR_USERNAME=<ocr_username>
+	export OCR_PASSWORD=<ocr_password>
 	```
 
  Method 2 
- - Make sure the weblogic image i.e. middleware/weblogic:12.2.1.3 already exists locally in a docker repository the k8s cluster can access
+ - Make sure the weblogic image i.e. container-registry.oracle.com/middleware/weblogic:12.2.1.3 already exists locally in a docker repository the k8s cluster can access
  - Make sure the weblogic image has patch p29135930 (required for the WebLogic Kubernetes Operator). 
-  	- If not, see [https://github.com/oracle/docker-images/tree/master/OracleWebLogic/samples/12213-patch-wls-for-k8s].
 
 
 * Command to run the tests: 

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

@@ -208,34 +208,32 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
               + "/weblogick8s/middleware/weblogic:duplicate");
 
       if (BaseTest.SHARED_CLUSTER) {
-        // unskip this code once OWLS-74986 is fixed.
-        if (false) {
-          String newImage =
-              System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
-          // tag image with repo name
-          String tag =
-              "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage;
-          TestUtils.ExecAndPrintLog(tag);
-          TestUtils.ExecAndPrintLog("docker images");
-
-          // 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 + "\"");
-        }
+        String newImage =
+            System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
+        // tag image with repo name
+        String tag =
+            "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage;
+        TestUtils.ExecAndPrintLog(tag);
+        TestUtils.ExecAndPrintLog("docker images");
+
+        // 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 "

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

@@ -363,12 +363,7 @@ public void verifyHasClusterServiceChannelPort(String protocol, int port, String
   public void deployWebAppViaREST(
       String webappName, String webappLocation, String username, String password) throws Exception {
     StringBuffer cmd = new StringBuffer();
-    if (!BaseTest.SHARED_CLUSTER) {
-      cmd.append("curl --noproxy '*' ");
-    } else {
-      cmd.append("curl ");
-    }
-    cmd.append("--silent  --user ")
+    cmd.append("curl --noproxy '*' --silent  --user ")
         .append(username)
         .append(":")
         .append(password)
@@ -386,7 +381,6 @@ 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());

integration-tests/src/test/resources/setupenv.sh

@@ -237,9 +237,6 @@ if [ "$SHARED_CLUSTER" = "true" ]; then
 			echo "Provide Docker login details using REPO_REGISTRY, REPO_USERNAME, REPO_PASSWORD & REPO_EMAIL env variables to push the Operator image to the repository."
 			exit 1
 	  	fi
-
-                echo "login to $REPO_REGISTRY"
-                docker login $REPO_REGISTRY -u $REPO_USERNAME -p $REPO_PASSWORD
 
 	  	echo "Creating Registry Secret"
 	  	kubectl create secret docker-registry $IMAGE_PULL_SECRET_OPERATOR  \