Merge branch 'feature/helm_operator_1_1' into fix_CreateDomainGeneratedFilesOptionalFeaturesDisabledIT

Author: alai8

src/integration-tests/bash/run.sh

@@ -775,7 +775,7 @@ function deploy_operator {
       local outfile="${TMP_DIR}/create-weblogic-operator-helm.out"
       trace "Run helm install to deploy the weblogic operator, see \"$outfile\" for tracking."
       cd $PROJECT_ROOT/kubernetes/charts
-      helm install weblogic-operator --name ${NAMESPACE} -f $inputs 2>&1 | opt_tee ${outfile}
+      helm install weblogic-operator --name ${opkey} -f $inputs 2>&1 | opt_tee ${outfile}
       trace "helm install output:"
       cat $outfile
       operator_ready_wait $opkey
@@ -2487,6 +2487,27 @@ function test_domain_lifecycle {
     declare_test_pass
 }
 
+function wait_for_operator_shutdown {
+  name=$1
+  deleted=false
+  iter=1
+  trace "waiting for operator shutdown by verifying that namespace ${name} no longer exist "
+  while [ ${deleted} == false -a $iter -lt 101 ]; do
+    kubectl get namespace ${name}
+    if [ $? != 0 ]; then
+      deleted=true
+    else
+      iter=`expr $iter + 1`
+      sleep 5
+    fi
+  done
+  if [ ${deleted} == false ]; then
+    fail 'operator fail to be deleted'
+  else
+    trace "operator namespace ${name} has been deleted"
+  fi
+}
+
 function shutdown_operator {
     if [ "$#" != 1 ] ; then
       fail "requires 1 parameter: operatorKey"
@@ -2496,7 +2517,8 @@ function shutdown_operator {
     local TMP_DIR="`op_get $OP_KEY TMP_DIR`"
 
     if [ "$USE_HELM" = "true" ]; then
-      helm delete $OPERATOR_NS --purge
+      helm delete $OP_KEY --purge
+      wait_for_operator_shutdown $OPERATOR_NS
     else
       kubectl delete -f $TMP_DIR/weblogic-operator.yaml
     fi
@@ -2522,7 +2544,7 @@ function startup_operator {
     if [ "$USE_HELM" = "true" ]; then
       local inputs="$TMP_DIR/weblogic-operator-values.yaml"
       local outfile="$TMP_DIR/startup-weblogic-operator.out"
-      helm install weblogic-operator --name ${OPERATOR_NS} -f $inputs 2>&1 | opt_tee ${outfile}
+      helm install weblogic-operator --name ${OP_KEY} -f $inputs 2>&1 | opt_tee ${outfile}
       trace "helm install output:"
       cat $outfile
     else
@@ -2993,8 +3015,11 @@ function test_suite {
     kubectl create namespace test1 2>&1 | sed 's/^/+/g' 
     kubectl create namespace test2 2>&1 | sed 's/^/+/g' 
 
-    kubectl create namespace weblogic-operator-1 2>&1 | sed 's/^/+/g' 
-    kubectl create namespace weblogic-operator-2 2>&1 | sed 's/^/+/g' 
+    if ! [ "$USE_HELM" = "true" ]; then
+      # do not create ooperator namespace when using helm charts
+      kubectl create namespace weblogic-operator-1 2>&1 | sed 's/^/+/g' 
+      kubectl create namespace weblogic-operator-2 2>&1 | sed 's/^/+/g' 
+    fi
 
     # This test pass pairs with 'declare_new_test 1 define_operators_and_domains' above
     declare_test_pass