change jrf docker image to OCR

Author: xiancao

integration-tests/README.md

@@ -300,16 +300,9 @@ JUnit test results can be seen at "integration-tests/target/failsafe-reports/TES
 * Setup docker access to FMW Infrastructure 12c Image and Oracle Database 12c Image
 
  Method 1 
-  - Setup a personal account on hub.docker.com
-  - Then sign in to hub.docker.com and signup for access to Oracle Database 12c Images via https://hub.docker.com/_/oracle-database-enterprise-edition
-  - Then export the following before running the tests: 
-	```
-	export DOCKER_USERNAME=<docker_username>
-	export DOCKER_PASSWORD=<docker_password>
-	export DOCKER_EMAIL=<docker_email>
-	```
-  - Setup an account in phx.ocir.io
-  - Then sign in to phx.ocir.io to get access to FMW Infrastructure 12c Image: **_phx.ocir.io/weblogick8s/oracle/fmw-infrastructure:12.2.1.3_**
+  - Setup a personal account on container-registry.oracle.com
+  - Then sign in to container-registry.oracle.com and accept license for access to Oracle Database 12c Images:  **_container-registry.oracle.com/database/enterprise:12.2.0.1-slim_**
+  - And get access to FMW Infrastructure 12c Image: **_container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3_**
   - export the following before running the tests:
     ```
     export REPO_USERNAME=<ocir_username>
@@ -318,7 +311,7 @@ JUnit test results can be seen at "integration-tests/target/failsafe-reports/TES
     ```
  
  Method 2 
- - Make sure the FMW Infrastructure image i.e. **_phx.ocir.io/weblogick8s/oracle/fmw-infrastructure:12.2.1.3_** and the Oracle database image i.e. **_store/oracle/database-enterprise:12.2.0.1_** already exist locally in a docker repository the k8s cluster can access
+ - Make sure the FMW Infrastructure image i.e. **_container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3_** and the Oracle database image i.e. **_container-registry.oracle.com/database/enterprise:12.2.0.1-slim_** already exist locally in a docker repository the k8s cluster can access
 		
 * Command to run the tests: 
 ```

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

@@ -9,7 +9,7 @@
 
 public class DBUtils {
   public static final String DEFAULT_FMWINFRA_DOCKER_IMAGENAME =
-      "phx.ocir.io/weblogick8s/oracle/fmw-infrastructure";
+      "container-registry.oracle.com/middleware/fmw-infrastructure";
   public static final String DEFAULT_FMWINFRA_DOCKER_IMAGETAG = "12.2.1.3";
   public static final String DEFAULT_RCU_SCHEMA_USERNAME = "myrcuuser";
   public static final String DEFAULT_RCU_SCHEMA_PASSWORD = "Oradoc_db1";

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

@@ -12,7 +12,8 @@ public class OracleDB {
   // DB default properties
   public static final String DEFAULT_DB_NAME = "infradb";
   public static final String DEFAULT_DB_NAMESPACE = "db";
-  public static final String DEFAULT_DB_IMAGE = "store/oracle/database-enterprise:12.2.0.1";
+  public static final String DEFAULT_DB_IMAGE =
+      "container-registry.oracle.com/database/enterprise:12.2.0.1-slim";
   public static final String DEFAULT_DB_PORT = "1521";
   public static final String DEFAULT_DB_SID = "InfraDB";
   public static final String DEFAULT_DB_PDB = "InfraPDB1";

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

@@ -18,6 +18,6 @@ serverStartPolicy: ADMIN_ONLY
 loadBalancer: TRAEFIK
 ingressPerDomain: true
 voyagerWebPort: 30309
-image: phx.ocir.io/weblogick8s/oracle/fmw-infrastructure:12.2.1.3
+image: container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3
 rcuSchemaPrefix: jrfdomain4
 rcuDatabaseURL: infradb.db.svc.cluster.local:1521/InfraPDB1.us.oracle.com

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

@@ -13,7 +13,7 @@ exposeAdminT3Channel: true
 t3ChannelPort: 30013
 exposeAdminNodePort: true
 namespace: jrfdomains
-image: phx.ocir.io/weblogick8s/oracle/fmw-infrastructure:12.2.1.3
+image: container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3
 ingressPerDomain: true
 rcuSchemaPrefix: jrfdomain
 rcuDatabaseURL: infradb.db.svc.cluster.local:1521/InfraPDB1.us.oracle.com

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

@@ -13,7 +13,7 @@ exposeAdminT3Channel: true
 t3ChannelPort: 30014
 exposeAdminNodePort: true
 namespace: test2
-image: phx.ocir.io/weblogick8s/oracle/fmw-infrastructure:12.2.1.3
+image: container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3
 ingressPerDomain: true
 rcuSchemaPrefix: jrfdomain2
 rcuDatabaseURL: infradb.db.svc.cluster.local:1521/InfraPDB1.us.oracle.com

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

@@ -19,6 +19,6 @@ loadBalancer: TRAEFIK
 ingressPerDomain: true
 voyagerWebPort: 30311
 clusterType: CONFIGURED
-image: phx.ocir.io/weblogick8s/oracle/fmw-infrastructure:12.2.1.3
+image: container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3
 rcuSchemaPrefix: jrfrecycle
 rcuDatabaseURL: infradb.db.svc.cluster.local:1521/InfraPDB1.us.oracle.com

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

@@ -9,3 +9,4 @@ ingressPerDomain: true
 voyagerWebPort: 30310
 rcuSchemaPrefix: jrfsampledef
 rcuDatabaseURL: infradb.db.svc.cluster.local:1521/InfraPDB1.us.oracle.com
+image: container-registry.oracle.com/middleware/fmw-infrastructure:12.2.1.3

integration-tests/src/test/resources/oracledb.properties

@@ -3,7 +3,7 @@
 
 name=infradb
 namespace=db
-image=store/oracle/database-enterprise:12.2.0.1
+image=container-registry.oracle.com/database/enterprise:12.2.0.1-slim
 port=1521
 db_sid=InfraDB
 db_pdb=InfraPDB1

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

@@ -138,64 +138,29 @@ function pull_tag_images {
 
 function pull_tag_images_jrf {
 
-set +x 
+  set +x
   # Check if fwm infra image exists
-  if [ -z "$REPO_USERNAME" ] || [ -z "$REPO_PASSWORD" ] || [ -z "$REPO_EMAIL" ]; then
+  if [ -z "$OCR_USERNAME" ] || [ -z "$OCR_PASSWORD" ]; then
 	if [ -z $(docker images -q $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC) ]; then
-		echo "Image $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC doesn't exist. Provide Docker login details using env variables REPO_USERNAME, REPO_PASSWORD and REPO_EMAIL to pull the image."
+		echo "Image $IMAGE_NAME_FMWINFRA:$IMAGE_TAG_FMWINFRA doesn't exist. Provide Docker login details using env variables OCR_USERNAME and OCR_PASSWORD to pull the image."
 	  	exit 1
 	fi
+	if [ -z $(docker images -q $IMAGE_NAME_ORACLEDB:$IMAGE_TAG_ORACLEDB) ]; then
+    	echo "Image $IMAGE_NAME_ORACLEDB:$IMAGE_TAG_ORACLEDB doesn't exist. Provide Docker login details using env variables OCR_USERNAME and OCR_PASSWORD to pull the image."
+      	exit 1
+    fi
   fi
 
-  # Create secret to pull fmw infra image if required env variables are provided
-  if [ -n "$REPO_USERNAME" ] && [ -n "$REPO_PASSWORD" ] && [ -n "$REPO_EMAIL" ]; then  
-		echo "Creating Registry Secret"
-    	kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
-			    --docker-server=phx.ocir.io \
-			    --docker-username=$REPO_USERNAME \
-			    --docker-password=$REPO_PASSWORD \
-			    --docker-email=$REPO_EMAIL 
-	   	echo "Checking Secret"
-		SECRET="`kubectl get secret $IMAGE_PULL_SECRET_WEBLOGIC | grep $IMAGE_PULL_SECRET_WEBLOGIC | wc | awk ' { print $1; }'`"
-		if [ "$SECRET" != "1" ]; then
-		   echo "secret $IMAGE_PULL_SECRET_WEBLOGIC was not created successfully"
-		   exit 1
-		fi
+  # reuse the create secret logic
+  pull_tag_images
 
-		# pull fmw infra images
-		docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC
-  fi
-	
-  # Check if OracleDB image exists
-  if [ -z "$DOCKER_USERNAME" ] || [ -z "$DOCKER_PASSWORD" ] || [ -z "$DOCKER_EMAIL" ]; then
-	if [ -z $(docker images -q $IMAGE_NAME_ORACLEDB:$IMAGE_TAG_ORACLEDB) ]; then
-		echo "Image $IMAGE_NAME_ORACLEDB:$IMAGE_TAG_ORACLEDB doesn't exist. Provide Docker login details using env variables DOCKER_USERNAME, DOCKER_PASSWORD and DOCKER_EMAIL to pull the image."
-	  	exit 1
-	fi
-  fi
-  
-  # Create secret to pull OracleDB image if required env variables are provided
-  if [ -n "$DOCKER_USERNAME" ] && [ -n "$DOCKER_PASSWORD" ] && [ -n "$DOCKER_EMAIL" ]; then  
-	  echo "Creating Docker Secret"
-	  
-	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_ORACLEDB  \
-	    --docker-server=index.docker.io/v1/ \
-	    --docker-username=$DOCKER_USERNAME \
-	    --docker-password=$DOCKER_PASSWORD \
-	    --docker-email=$DOCKER_EMAIL 
-	  
-	  echo "Checking Secret"
-	  SECRET="`kubectl get secret $IMAGE_PULL_SECRET_ORACLEDB | grep $IMAGE_PULL_SECRET_ORACLEDB | wc | awk ' { print $1; }'`"
-	  if [ "$SECRET" != "1" ]; then
-	    echo "secret $IMAGE_PULL_SECRET_ORACLEDB was not created successfully"
-	    exit 1
-	  fi
-	  
-	  # pull oracle db image
-	  docker pull $IMAGE_NAME_ORACLEDB:$IMAGE_TAG_ORACLEDB
-  fi
-  set -x
+  # pull fmw infra images
+  docker pull $IMAGE_NAME_FMWINFRA:$IMAGE_TAG_FMWINFRA
+
+  # pull oracle db image
+  docker pull $IMAGE_NAME_ORACLEDB:$IMAGE_TAG_ORACLEDB
 
+  set -x
 }
 
 function get_wlthint3client_from_image {
@@ -220,14 +185,14 @@ export BRANCH_NAME="${BRANCH_NAME:-$SHARED_CLUSTER_GIT_BRANCH}"
 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}"
-  export IMAGE_PULL_SECRET_WEBLOGIC="ocir-store"
-  export IMAGE_NAME_ORACLEDB="${IMAGE_NAME_ORACLEDB:-store/oracle/database-enterprise}"
-  export IMAGE_TAG_ORACLEDB="${IMAGE_TAG_ORACLEDB:-12.2.0.1}"
-  export IMAGE_PULL_SECRET_ORACLEDB="${IMAGE_PULL_SECRET_ORACLEDB:-docker-store}"
-  
+  export FMWINFRA_IMAGE_URI=/middleware/fmw-infrastructure
+  export IMAGE_TAG_FMWINFRA=12.2.1.3
+  export DB_IMAGE_URI=/database/enterprise
+  export IMAGE_NAME_ORACLEDB="${IMAGE_NAME_ORACLEDB:-`echo ${WL_DOCKER_SERVER}``echo ${DB_IMAGE_URI}`}"
+  export IMAGE_TAG_ORACLEDB="${IMAGE_TAG_ORACLEDB:-12.2.0.1-slim}"
 fi
 export IMAGE_NAME_WEBLOGIC="${IMAGE_NAME_WEBLOGIC:-`echo ${WL_DOCKER_SERVER}``echo ${WLS_IMAGE_URI}`}"
+export IMAGE_NAME_FMWINFRA="${IMAGE_NAME_FMWINFRA:-`echo ${WL_DOCKER_SERVER}``echo ${FMWINFRA_IMAGE_URI}`}"
 export IMAGE_PULL_SECRET_WEBLOGIC="${IMAGE_PULL_SECRET_WEBLOGIC:-docker-store}"
 
 if [ -z "$BRANCH_NAME" ]; then
@@ -369,4 +334,4 @@ else
   if [ "$JRF_ENABLED" = false ]; then
   	get_wlthint3client_from_image
   fi
-fi
+fi