changes to use

"container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111"

Author: sankarpn

integration-tests/README.md

@@ -180,7 +180,7 @@ 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 store/oracle/weblogic and 12.2.1.3
+* export WEBLOGIC_IMAGE_NAME and WEBLOGIC_IMAGE_TAG if different from middleware/weblogic and 12.2.1.3-190111
 * Setup docker access to WebLogic 12c Images 
 
  Method 1 
@@ -194,7 +194,7 @@ K8sTestUtils - uses k8s java client api, this is used only for delete domain use
 	```
 
  Method 2 
- - Make sure the weblogic image i.e. store/oracle/weblogic:12.2.1.3 already exists locally in a docker repository the k8s cluster can access
+ - Make sure the weblogic image i.e. middleware/weblogic:12.2.1.3-190111 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].
 

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

@@ -62,7 +62,7 @@ public class Domain {
   private String projectRoot = "";
   private boolean ingressPerDomain = true;
   private String imageTag = "12.2.1.3";
-  private String imageName = "store/oracle/weblogic";
+  private String imageName = "middleware/weblogic";
 
   protected String generatedInputYamlFile;
 

integration-tests/src/test/resources/domaininimagewdt.yaml

@@ -9,6 +9,6 @@ exposeAdminT3Channel: true
 exposeAdminNodePort: true
 voyagerWebPort: 30333
 domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image-wdt
-domainHomeImageBase: "store/oracle/weblogic:12.2.1.3"
+domainHomeImageBase: "container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111"
 logHomeOnPV: true
 clusterType: CONFIGURED

integration-tests/src/test/resources/domaininimagewlst.yaml

@@ -9,5 +9,5 @@ exposeAdminT3Channel: true
 exposeAdminNodePort: true
 voyagerWebPort: 30322
 domainHomeImageBuildPath: ./docker-images/OracleWebLogic/samples/12213-domain-home-in-image
-domainHomeImageBase: "store/oracle/weblogic:12.2.1.3"
+domainHomeImageBase: "container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111"
 logHomeOnPV: true

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

@@ -87,7 +87,7 @@ function pull_tag_images {
 	  echo "Creating Docker Secret"
 
 	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
-	    --docker-server=index.docker.io/v1/ \
+	    --docker-server=container-registry.oracle.com/ \
 	    --docker-username=$DOCKER_USERNAME \
 	    --docker-password=$DOCKER_PASSWORD \
 	    --docker-email=$DOCKER_EMAIL 
@@ -99,7 +99,7 @@ function pull_tag_images {
 	    exit 1
 	  fi
 	  # below docker pull is needed to get wlthint3client.jar from image to put in the classpath
-	  docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+	  docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD container-registry.oracle.com
    	  docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC
   fi
   set -x
@@ -149,7 +149,7 @@ set +x
 	  echo "Creating Docker Secret"
 
 	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_ORACLEDB  \
-	    --docker-server=index.docker.io/v1/ \
+	    --docker-server=container-registry.oracle.com/ \
 	    --docker-username=$DOCKER_USERNAME \
 	    --docker-password=$DOCKER_PASSWORD \
 	    --docker-email=$DOCKER_EMAIL 
@@ -185,7 +185,7 @@ export RESULT_ROOT=${RESULT_ROOT:-/scratch/$USER/wl_k8s_test_results}
 export PV_ROOT=${PV_ROOT:-$RESULT_ROOT}
 echo "RESULT_ROOT$RESULT_ROOT PV_ROOT$PV_ROOT"
 export BRANCH_NAME="${BRANCH_NAME:-$SHARED_CLUSTER_GIT_BRANCH}"
-export IMAGE_TAG_WEBLOGIC="${IMAGE_TAG_WEBLOGIC:-12.2.1.3}"
+export IMAGE_TAG_WEBLOGIC="${IMAGE_TAG_WEBLOGIC:-12.2.1.3-190111}"
 
 if [ "$JRF_ENABLED" = true ] ; then
   export IMAGE_NAME_WEBLOGIC="${IMAGE_NAME_WEBLOGIC:-phx.ocir.io/weblogick8s/oracle/fmw-infrastructure}"
@@ -195,7 +195,7 @@ if [ "$JRF_ENABLED" = true ] ; then
   export IMAGE_PULL_SECRET_ORACLEDB="${IMAGE_PULL_SECRET_ORACLEDB:-docker-store}"
 
 fi
-export IMAGE_NAME_WEBLOGIC="${IMAGE_NAME_WEBLOGIC:-store/oracle/weblogic}"
+export IMAGE_NAME_WEBLOGIC="${IMAGE_NAME_WEBLOGIC:-container-registry.oracle.com/middleware/weblogic}"
 export IMAGE_PULL_SECRET_WEBLOGIC="${IMAGE_PULL_SECRET_WEBLOGIC:-docker-store}"
 
 if [ -z "$BRANCH_NAME" ]; then
@@ -261,7 +261,7 @@ if [ "$SHARED_CLUSTER" = "true" ]; then
 
 	echo "Creating Docker Secret"
 	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
-	    --docker-server=index.docker.io/v1/ \
+	    --docker-server=container-registry.oracle.com/ \
 	    --docker-username=$DOCKER_USERNAME \
 	    --docker-password=$DOCKER_PASSWORD \
 	    --docker-email=$DOCKER_EMAIL