fix

Author: sankarpn

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

@@ -71,6 +71,7 @@ public class BaseTest {
   private static Properties appProps;
   private static String weblogicImageTag;
   private static String weblogicImageName;
+  private static String weblogicImageServer;
 
   // Set QUICKTEST env var to true to run a small subset of tests.
   // Set SMOKETEST env var to true to run an even smaller subset of tests
@@ -114,6 +115,10 @@ public static void initialize(String appPropsFile) throws Exception {
         System.getenv("IMAGE_NAME_WEBLOGIC") != null
             ? System.getenv("IMAGE_NAME_WEBLOGIC")
             : appProps.getProperty("weblogicImageName");
+    weblogicImageServer =
+        System.getenv("OCR_SERVER") != null
+            ? System.getenv("OCR_SERVER")
+            : appProps.getProperty("OCR_SERVER");
     maxIterationsPod =
         new Integer(appProps.getProperty("maxIterationsPod", "" + maxIterationsPod)).intValue();
     waitTimePod = new Integer(appProps.getProperty("waitTimePod", "" + waitTimePod)).intValue();
@@ -254,6 +259,16 @@ public static String getWeblogicImageTag() {
   public static String getWeblogicImageName() {
     return weblogicImageName;
   }
+
+  /**
+   * getter method for weblogicImageServer
+   *
+   * @return image name of the WLS docker image
+   */
+  public static String getWeblogicImageServer() {
+    return weblogicImageServer;
+  }
+
   /**
    * Call the basic usecases tests
    *

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

@@ -220,7 +220,7 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
         // image
         TestUtils.createDockerRegistrySecret(
             "docker-store",
-            System.getenv("WL_DOCKER_SERVER"),
+            BaseTest.getWeblogicImageServer(),
             System.getenv("OCR_USERNAME"),
             System.getenv("OCR_PASSWORD"),
             "[email protected] ",

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

@@ -9,3 +9,4 @@ maxIterationsPod=25
 waitTimePod=10
 weblogicImageTag = 12.2.1.3-190111
 weblogicImageName = container-registry.oracle.com/middleware/weblogic
+OCR_SERVER="container-registry.oracle.com"

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

@@ -117,7 +117,7 @@ function pull_tag_images {
 	  echo "Creating Docker Secret"
 
 	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
-	    --docker-server=${WL_DOCKER_SERVER}/ \
+	    --docker-server=${OCR_SERVER}/ \
 	    --docker-username=$OCR_USERNAME \
 	    --docker-password=$OCR_PASSWORD \
             --dry-run -o yaml | kubectl apply -f -
@@ -129,8 +129,8 @@ function pull_tag_images {
 	    exit 1
 	  fi
 	  # below docker pull is needed to get wlthint3client.jar from image to put in the classpath
-          # echo "docker login -u $OCR_USERNAME -p $OCR_PASSWORD ${WL_DOCKER_SERVER}"
-	  docker login -u $OCR_USERNAME -p $OCR_PASSWORD ${WL_DOCKER_SERVER}
+          # echo "docker login -u $OCR_USERNAME -p $OCR_PASSWORD ${OCR_SERVER}"
+	  docker login -u $OCR_USERNAME -p $OCR_PASSWORD ${OCR_SERVER}
           # echo "docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC"
    	  docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC
   fi
@@ -175,7 +175,7 @@ function get_wlthint3client_from_image {
   docker rm -v $id
 
 }
-export WL_DOCKER_SERVER=container-registry.oracle.com
+export OCR_SERVER=container-registry.oracle.com
 export WLS_IMAGE_URI=/middleware/weblogic
 export SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 export PROJECT_ROOT="$SCRIPTPATH/../../../.."
@@ -189,11 +189,11 @@ if [ "$JRF_ENABLED" = true ] ; then
   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_NAME_ORACLEDB="${IMAGE_NAME_ORACLEDB:-`echo ${OCR_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_NAME_WEBLOGIC="${IMAGE_NAME_WEBLOGIC:-`echo ${OCR_SERVER}``echo ${WLS_IMAGE_URI}`}"
+export IMAGE_NAME_FMWINFRA="${IMAGE_NAME_FMWINFRA:-`echo ${OCR_SERVER}``echo ${FMWINFRA_IMAGE_URI}`}"
 export IMAGE_PULL_SECRET_WEBLOGIC="${IMAGE_PULL_SECRET_WEBLOGIC:-docker-store}"
 
 if [ -z "$BRANCH_NAME" ]; then