Merge remote-tracking branch 'origin/imagetestchanges' into release/2.2

rjeberhard · rjeberhard · commit 09fc488e9c92 · 2019-05-30T16:42:59.000-04:00
diff --git a/integration-tests/README.md b/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].
 		
diff --git a/integration-tests/USECASES.MD b/integration-tests/USECASES.MD
@@ -68,7 +68,7 @@ Basic Use Cases described above are verified in all the domain configurations. A
 | Server Pods Restarted by modifying properties on the domain resource| Use Case |
 | --- | --- |
 | Server pods restarted by changing Env property | Verify admin and managed server pods being restarted by property change: `-Dweblogic.StdoutDebugEnabled=false` --> `-Dweblogic.StdoutDebugEnabled=true` |
-| Server pods restarted by changing image | Verify admin and managed server pods being restarted by property change: image: `store/oracle/weblogic:12.2.1.3` --> image: `store/oracle/weblogic:duplicate` |
+| Server pods restarted by changing image | Verify admin and managed server pods being restarted by property change: image: `container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111` --> image: `container-registry.oracle.com/middleware/weblogic:duplicate` |
 | Server pods restarted by changing imagePullPolicy | Verify  admin and managed server pods being restarted by property change: imagePullPolicy: IfNotPresent --> imagePullPolicy: Never |
 | Server pods restarted by changing includeServerOutInPodLog | Verify admin and managed server pods being restarted by property change: includeServerOutInPodLog: true --> includeServerOutInPodLog: false |
 | Server pods restarted by changing logHomeEnable | Verify admin and managed server pods being restarted by property change: logHomeEnabled: true --> logHomeEnabled: false |
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java b/integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java
@@ -69,6 +69,8 @@ public class BaseTest {
   protected static String appLocationInPod = "/u01/oracle/apps";
   private static String appLocationOnHost;
   private static Properties appProps;
+  private static String weblogicImageTag;
+  private static String weblogicImageName;
 
   // 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
@@ -104,6 +106,14 @@ public static void initialize(String appPropsFile) throws Exception {
     }
     username = appProps.getProperty("username", username);
     password = appProps.getProperty("password", password);
+    weblogicImageTag =
+        System.getenv("IMAGE_TAG_WEBLOGIC") != null
+            ? System.getenv("IMAGE_TAG_WEBLOGIC")
+            : appProps.getProperty("weblogicImageTag");
+    weblogicImageName =
+        System.getenv("IMAGE_NAME_WEBLOGIC") != null
+            ? System.getenv("IMAGE_NAME_WEBLOGIC")
+            : appProps.getProperty("weblogicImageName");
     maxIterationsPod =
         new Integer(appProps.getProperty("maxIterationsPod", "" + maxIterationsPod)).intValue();
     waitTimePod = new Integer(appProps.getProperty("waitTimePod", "" + waitTimePod)).intValue();
@@ -227,6 +237,23 @@ public static void initialize(String appPropsFile) throws Exception {
     logger.info("Env var BRANCH_NAME " + System.getenv("BRANCH_NAME"));
   }
 
+  /**
+   * getter method for weblogicImageTag field
+   *
+   * @return image tag of the WLS docker images
+   */
+  public static String getWeblogicImageTag() {
+    return weblogicImageTag;
+  }
+
+  /**
+   * getter method for weblogicImageName
+   *
+   * @return image name of the WLS docker image
+   */
+  public static String getWeblogicImageName() {
+    return weblogicImageName;
+  }
   /**
    * Call the basic usecases tests
    *
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java
@@ -184,7 +184,8 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
   /**
    * Modify the domain scope property on the domain resource using kubectl apply -f domain.yaml
    * Verify that all the server pods in the domain got re-started .The property tested is: image:
-   * "store/oracle/weblogic:12.2.1.3" --> image: "store/oracle/weblogic:duplicate"
+   * "container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111" --> image:
+   * "container-registry.oracle.com/middleware/weblogic:duplicate"
    *
    * @throws Exception
    */
@@ -198,14 +199,19 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
       logger.info(
           "About to verifyDomainServerPodRestart for Domain: "
               + domain.getDomainUid()
-              + "  Image property: store/oracle/weblogic:12.2.1.3 to store/oracle/weblogic:duplicate");
+              + "  Image property: "
+              + getWeblogicImageName()
+              + ":"
+              + getWeblogicImageTag()
+              + " to /weblogick8s/middleware/weblogic:duplicate");
 
       if (BaseTest.SHARED_CLUSTER) {
         String newImage =
-            System.getenv("REPO_REGISTRY") + "/weblogick8s/store/oracle/weblogic:duplicate";
+            System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
 
         // tag image with repo name
-        TestUtils.exec("docker tag store/oracle/weblogic:12.2.1.3 " + newImage);
+        TestUtils.exec(
+            "docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage);
 
         // login and push image to ocir
         TestUtils.loginAndPushImageToOCIR(newImage);
@@ -222,15 +228,24 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
 
         // apply new domain yaml and verify pod restart
         domain.verifyDomainServerPodRestart(
-            "\"store/oracle/weblogic:12.2.1.3\"", "\"" + newImage + "\"");
+            "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
+            "\"" + newImage + "\"");
       } else {
-        TestUtils.exec("docker tag store/oracle/weblogic:12.2.1.3 store/oracle/weblogic:duplicate");
+        TestUtils.exec(
+            "docker tag "
+                + getWeblogicImageName()
+                + ":"
+                + getWeblogicImageTag()
+                + " "
+                + getWeblogicImageName()
+                + ":duplicate");
         domain.verifyDomainServerPodRestart(
-            "\"store/oracle/weblogic:12.2.1.3\"", "\"store/oracle/weblogic:duplicate\"");
+            "\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
+            "\"" + getWeblogicImageName() + ":duplicate" + "\"");
       }
     } finally {
       if (!BaseTest.SHARED_CLUSTER) {
-        TestUtils.exec("docker rmi -f store/oracle/weblogic:duplicate");
+        TestUtils.exec("docker rmi -f " + getWeblogicImageName() + ":duplicate");
       }
     }
 
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java
@@ -61,8 +61,8 @@ public class Domain {
   protected String userProjectsDir = "";
   private String projectRoot = "";
   private boolean ingressPerDomain = true;
-  private String imageTag = "12.2.1.3";
-  private String imageName = "store/oracle/weblogic";
+  private String imageTag;
+  private String imageName;
 
   protected String generatedInputYamlFile;
 
@@ -1384,6 +1384,8 @@ private void callWebAppAndCheckForServerNameInResponse(
    *     accessed to read or if creating config map or secret fails for configoverrides
    */
   protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
+    imageTag = BaseTest.getWeblogicImageTag();
+    imageName = BaseTest.getWeblogicImageName();
     domainMap = inputDomainMap;
     this.userProjectsDir = BaseTest.getUserProjectsDir();
     this.projectRoot = BaseTest.getProjectRoot();
diff --git a/integration-tests/src/test/resources/OperatorIT.properties b/integration-tests/src/test/resources/OperatorIT.properties
@@ -7,3 +7,5 @@ username=weblogic
 password=welcome1
 maxIterationsPod=25
 waitTimePod=10
+weblogicImageTag = 12.2.1.3-190111
+weblogicImageName = container-registry.oracle.com/middleware/weblogic
diff --git a/integration-tests/src/test/resources/domaininimagewdt.yaml b/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
diff --git a/integration-tests/src/test/resources/domaininimagewlst.yaml b/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
diff --git a/integration-tests/src/test/resources/setupenv.sh b/integration-tests/src/test/resources/setupenv.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 # Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
@@ -45,6 +45,35 @@ function setup_jenkins {
   echo "Helm is configured."
 }
 
+function docker_login {
+
+  set +x 
+  if [ -z "$DOCKER_USERNAME" ] || [ -z "$DOCKER_PASSWORD" ]; then
+        echo "DOCKER_USERNAME and DOCKER_PASSWORD not set !!!"
+	exit 1
+  fi
+  
+  if [ -n "$DOCKER_USERNAME" ] && [ -n "$DOCKER_PASSWORD" ]; then  
+	  echo "Creating Docker Secret"
+	  
+	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
+	    --docker-server=index.docker.io/v1/ \
+	    --docker-username=$DOCKER_USERNAME \
+	    --docker-password=$DOCKER_PASSWORD
+	  
+	  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
+	  # below docker pull is needed to get wlthint3client.jar from image to put in the classpath
+	  docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+  fi
+  set -x
+
+}
+
 function setup_shared_cluster {
   echo "Perform setup for running on shared cluster"
   echo "Install tiller"
@@ -76,21 +105,20 @@ function clean_shared_cluster {
 function pull_tag_images {
 
   set +x 
-  if [ -z "$DOCKER_USERNAME" ] || [ -z "$DOCKER_PASSWORD" ] || [ -z "$DOCKER_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 DOCKER_USERNAME, DOCKER_PASSWORD and DOCKER_EMAIL to pull the image."
+		echo "Image $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC doesn't exist. Provide Docker login details using env variables OCR_USERNAME and OCR_PASSWORD to pull the image."
 	  	exit 1
 	fi
   fi
   
-  if [ -n "$DOCKER_USERNAME" ] && [ -n "$DOCKER_PASSWORD" ] && [ -n "$DOCKER_EMAIL" ]; then  
+  if [ -n "$OCR_USERNAME" ] && [ -n "$OCR_PASSWORD" ]; then  
 	  echo "Creating Docker Secret"
 	  
 	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
-	    --docker-server=index.docker.io/v1/ \
-	    --docker-username=$DOCKER_USERNAME \
-	    --docker-password=$DOCKER_PASSWORD \
-	    --docker-email=$DOCKER_EMAIL 
+	    --docker-server=${WL_DOCKER_SERVER}/ \
+	    --docker-username=$OCR_USERNAME \
+	    --docker-password=$OCR_PASSWORD
 	  
 	  echo "Checking Secret"
 	  SECRET="`kubectl get secret $IMAGE_PULL_SECRET_WEBLOGIC | grep $IMAGE_PULL_SECRET_WEBLOGIC | wc | awk ' { print $1; }'`"
@@ -99,7 +127,9 @@ 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
+          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 pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC"
    	  docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC
   fi
   set -x
@@ -179,13 +209,15 @@ function get_wlthint3client_from_image {
   docker rm -v $id
   
 }
+export WL_DOCKER_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/../../../.."
 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 +227,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:-`echo ${WL_DOCKER_SERVER}``echo ${WLS_IMAGE_URI}`}"
 export IMAGE_PULL_SECRET_WEBLOGIC="${IMAGE_PULL_SECRET_WEBLOGIC:-docker-store}"
     
 if [ -z "$BRANCH_NAME" ]; then
@@ -219,6 +251,8 @@ fi
 export JAR_VERSION="`grep -m1 "<version>" pom.xml | cut -f2 -d">" | cut -f1 -d "<"`"
 
 echo IMAGE_NAME_OPERATOR $IMAGE_NAME_OPERATOR IMAGE_TAG_OPERATOR $IMAGE_TAG_OPERATOR JAR_VERSION $JAR_VERSION
+
+#docker_login
   
 if [ "$SHARED_CLUSTER" = "true" ]; then
   
@@ -254,14 +288,14 @@ if [ "$SHARED_CLUSTER" = "true" ]; then
 		fi
   	fi 
   	
-  	if [ -z "$DOCKER_USERNAME" ] || [ -z "$DOCKER_PASSWORD" ] || [ -z "$DOCKER_EMAIL" ]; then
-		echo "Provide Docker login details using DOCKER_USERNAME, DOCKER_PASSWORD & DOCKER_EMAIL env variables to push the Operator image to the repository."
+  	if [ -z "$OCR_USERNAME" ] || [ -z "$OCR_PASSWORD" ]; then
+		echo "Provide Docker login details using OCR_USERNAME & OCR_PASSWORD env variables to push the Operator image to the repository."
 		exit 1
 	fi
 	
 	echo "Creating Docker Secret"
 	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC  \
-	    --docker-server=index.docker.io/v1/ \
+	    --docker-server=${WL_DOCKER_SERVER}/ \
 	    --docker-username=$DOCKER_USERNAME \
 	    --docker-password=$DOCKER_PASSWORD \
 	    --docker-email=$DOCKER_EMAIL 
diff --git a/src/integration-tests/kubernetes/command-job-template.yaml b/src/integration-tests/kubernetes/command-job-template.yaml
@@ -11,7 +11,7 @@ spec:
       activeDeadlineSeconds: 60
       containers:
         - name: domain-job
-          image: store/oracle/weblogic:12.2.1.3
+          image: container-registry.oracle.com/middleware/weblogic:12.2.1.3-190111
           imagePullPolicy: IfNotPresent
           volumeMounts:
           - mountPath: /scratch
