use pvc name for ls, imagepullpolicy for operator

Author: vanajamukkara

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

@@ -644,8 +644,10 @@ public void createDomainOnExistingDirectory() throws Exception {
             + domainMap.get("persistentVolumeClaimName")
             + ":/pvc-"
             + domainMap.get("domainUID")
-            + " -c \"ls -ltr "
-            + domainDir
+            + " -c \"ls -ltr /pvc-"
+            + domainMap.get("domainUID")
+            + "/domains/"
+            + domainMap.get("domainUID")
             + "\"";
     logger.info("making sure the domain directory exists by running " + cmd);
     ExecResult result = TestUtils.exec(cmd);

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

@@ -297,6 +297,7 @@ public Map<String, Object> getOperatorMap() {
   }
 
   public void callHelmInstall() throws Exception {
+    String imagePullPolicy = System.getenv("IMAGE_PULL_POLICY_OPERATOR");
     StringBuffer cmd = new StringBuffer("cd ");
     cmd.append(BaseTest.getProjectRoot())
         .append(" && helm install kubernetes/charts/weblogic-operator ");
@@ -306,7 +307,9 @@ public void callHelmInstall() throws Exception {
         .append(generatedInputYamlFile)
         .append(" --namespace ")
         .append(operatorNS)
-        .append(" --set \"imagePullPolicy=Always\" --wait --timeout 60");
+        .append(" --set \"imagePullPolicy=")
+        .append(imagePullPolicy)
+        .append("\" --wait --timeout 60");
     logger.info("Running " + cmd);
     ExecResult result = ExecCommand.exec(cmd.toString());
     if (result.exitValue() != 0) {

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

@@ -5,7 +5,7 @@
 
 function build_push_operator_image {
 	if [ -z "$REPO_REGISTRY" ] || [ -z "$REPO_USERNAME" ] || [ -z "$REPO_PASSWORD" ]; then
-		echo "Provide Docker login details using REPO_REGISTRY, REPO_USERNAME & REPO_PASSWORD env variables to push the Operator image to the repository.
+		echo "Provide Docker login details using REPO_REGISTRY, REPO_USERNAME & REPO_PASSWORD env variables to push the Operator image to the repository."
 		exit 1
 	fi
 

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

@@ -207,6 +207,8 @@ if [ -z "$BRANCH_NAME" ]; then
 fi
 export IMAGE_TAG_OPERATOR=${IMAGE_TAG_OPERATOR:-`echo "test_${BRANCH_NAME}" | sed "s#/#_#g"`}
 export IMAGE_NAME_OPERATOR=${IMAGE_NAME_OPERATOR:-weblogic-kubernetes-operator}
+export IMAGE_PULL_POLICY_OPERATOR=${IMAGE_PULL_POLICY_OPERATOR:-Always}
+export IMAGE_PULL_SECRET_OPERATOR=${IMAGE_PULL_SECRET_OPERATOR:-ocir-operator}
 
 cd $PROJECT_ROOT
 if [ $? -ne 0 ]; then
@@ -217,7 +219,6 @@ 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
-
 
 if [ "$SHARED_CLUSTER" = "true" ]; then
 
@@ -228,37 +229,56 @@ if [ "$SHARED_CLUSTER" = "true" ]; then
   if [ "$JRF_ENABLED" = true ] ; then
 	pull_tag_images_jrf	
   else
+  	export IMAGE_PULL_SECRET_OPERATOR=$IMAGE_PULL_SECRET_OPERATOR
+	export IMAGE_PULL_SECRET_WEBLOGIC=$IMAGE_PULL_SECRET_WEBLOGIC
+  
+  
+  	if [ "$IMAGE_PULL_POLICY_OPERATOR" = "Always" ]; then 
+		if [ -z "$REPO_REGISTRY" ] || [ -z "$REPO_USERNAME" ] || [ -z "$REPO_PASSWORD" ] || [ -z "$REPO_EMAIL" ]; 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 "Creating Registry Secret"
+	  	kubectl create secret docker-registry $IMAGE_PULL_SECRET_OPERATOR  \
+		    --docker-server=$REPO_REGISTRY \
+		    --docker-username=$REPO_USERNAME \
+		    --docker-password=$REPO_PASSWORD \
+		    --docker-email=$REPO_EMAIL 
 
-	  export IMAGE_PULL_SECRET_OPERATOR=$IMAGE_PULL_SECRET_OPERATOR
-	  export IMAGE_PULL_SECRET_WEBLOGIC=$IMAGE_PULL_SECRET_WEBLOGIC
+		echo "Checking Secret"
+		SECRET="`kubectl get secret $IMAGE_PULL_SECRET_OPERATOR | grep $IMAGE_PULL_SECRET_OPERATOR | wc | awk ' { print $1; }'`"
+		if [ "$SECRET" != "1" ]; then
+		    echo "secret $IMAGE_PULL_SECRET_OPERATOR was not created successfully"
+		    exit 1
+		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."
+		exit 1
+	fi
 
-	  echo "Creating Docker Secret"
+	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 
 
-	  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"
+	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
-	
-	  echo "Creating Registry Secret"
-	  kubectl create secret docker-registry $IMAGE_PULL_SECRET_OPERATOR  \
-	    --docker-server=$REPO_REGISTRY \
-	    --docker-username=$REPO_USERNAME \
-	    --docker-password=$REPO_PASSWORD \
-	    --docker-email=$REPO_EMAIL 
+	fi
+	  
+	if [ -z "$K8S_NODEPORT_HOST" ]; then
+	  	echo "When running in shared cluster option, provide DNS name or IP of a Kubernetes worker node using K8S_NODEPORT_HOST env variable"
+	  	exit 1
+	fi
+  
 
-	  echo "Checking Secret"
-	  SECRET="`kubectl get secret $IMAGE_PULL_SECRET_OPERATOR | grep $IMAGE_PULL_SECRET_OPERATOR | wc | awk ' { print $1; }'`"
-	  if [ "$SECRET" != "1" ]; then
-	    echo "secret $IMAGE_PULL_SECRET_OPERATOR was not created successfully"
-	    exit 1
-	  fi
   fi
   setup_shared_cluster
   get_wlthint3client_from_image