Config overrides test update.

Author: Tom Barnes

src/integration-tests/introspector/introspectTest.sh

@@ -402,10 +402,7 @@ function deployMySQL() {
     cat ${test_home}/docker_build.out
     exit 1
   fi
-  deployYamlTemplate mysql-secret.yamlt mysql-secret.yaml
-  deployYamlTemplate mysql-pv.yamlt     mysql-pv.yaml
-  deployYamlTemplate mysql-pvc.yamlt    mysql-pvc.yaml 
-  deployYamlTemplate mysql-pod.yamlt    mysql-pod.yaml
+  deployYamlTemplate mysql.yamlt mysql.yaml
 }
 
 #############################################################################
@@ -437,29 +434,6 @@ function deployCreateDomainJobPod() {
   # Wait for pod to come up successfully
 
   waitForPod $pod_name
-
-  # TODO: We can eliminate the following code if we (1) have job pod script touch
-  #       a file upon completion, and (2) have job pod ready check look for this file
-
-  local startSecs=$SECONDS
-  local maxsecs=30
-  local exitString=""
-  tracen "Info: Waiting up to $maxsecs seconds for pod '$pod_name' to run the wl-create-domain-pod.py script."
-  printdots_start
-  while [ $((SECONDS - startSecs)) -lt $maxsecs ] && [ "$exitString" = "" ]; do
-    exitString="`kubectl -n $NAMESPACE logs $pod_name 2>&1 | grep CREATE_DOMAIN_EXIT`"
-    sleep 1
-  done
-  printdots_end
-  if [ "$exitString" = "" ]; then
-    trace "Error: Timed out, see 'kubectl -n $NAMESPACE logs $pod_name'."
-    exit 1
-  fi
-  if [ ! "$exitString" = "CREATE_DOMAIN_EXIT=0" ]; then
-    trace "Error: Pod script failed, see 'kubectl -n $NAMESPACE logs $pod_name'."
-    exit 1
-  fi
-
 }
 
 #############################################################################
@@ -490,16 +464,8 @@ function deployIntrospectJobPod() {
   trace "Info: Deploying job pod '$pod_name' and waiting for it to be ready."
 
   (
-    export SERVER_NAME=introspect
     export JOB_NAME=${DOMAIN_UID}--introspect-domain-pod
     export JOB_SCRIPT=/test-scripts/wl-introspect-pod.sh
-    export SERVICE_NAME=`toDNS1123Legal ${DOMAIN_UID}-${server_name}`
-    export AS_SERVICE_NAME=`toDNS1123Legal ${DOMAIN_UID}-${ADMIN_NAME}`
-    if [ "${SERVER_NAME}" = "${ADMIN_NAME}" ]; then
-      export LOCAL_SERVER_DEFAULT_PORT=$ADMIN_PORT
-    else
-      export LOCAL_SERVER_DEFAULT_PORT=$MANAGED_SERVER_PORT
-    fi
     ${SCRIPTPATH}/util_subst.sh -g wl-introspect-pod.yamlt ${target_yaml}  || exit 1
   ) || exit 1
 
@@ -510,28 +476,6 @@ function deployIntrospectJobPod() {
 
   waitForPod $pod_name
 
-  # TODO: We can eliminate the following code if we (1) have job pod script touch
-  #       a file upon completion, and (2) have job pod ready check look for this file
-
-  local startSecs=$SECONDS
-  local maxsecs=30
-  local exitString=""
-  tracen "Info: Waiting up to $maxsecs seconds for pod '$pod_name' to run the introspectDomain.py script."
-  printdots_start
-  while [ $((SECONDS - startSecs)) -lt $maxsecs ] && [ "$exitString" = "" ]; do
-    exitString="`kubectl -n $NAMESPACE logs $pod_name 2>&1 | grep INTROSPECT_DOMAIN_EXIT`"
-    sleep 1
-  done
-  printdots_end
-  if [ "$exitString" = "" ]; then
-    trace "Error: Introspector timed out, see 'kubectl -n $NAMESPACE logs $pod_name'."
-    exit 1
-  fi
-  if [ ! "$exitString" = "INTROSPECT_DOMAIN_EXIT=0" ]; then
-    trace "Error: Introspector pod script failed, see 'kubectl -n $NAMESPACE logs $pod_name'."
-    exit 1
-  fi
-
   # parse job pod's output files
 
   kubectl -n $NAMESPACE logs $pod_name > ${test_home}/job-${DOMAIN_UID}-introspect-domain-pod-job.out 

src/integration-tests/introspector/mysql-pv.yamlt

@@ -2,18 +2,50 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 apiVersion: v1
-kind: Service
+kind: Secret
 metadata:
+  name: ${DOMAIN_UID}-mysql-secret
   labels:
+    weblogic.domainName: ${DOMAIN_NAME}
     weblogic.domainUID: ${DOMAIN_UID}
-  name: ${DOMAIN_UID}-mysql
+data:
+  # echo -n "root" | base64
+  root-user: cm9vdA==
+  # echo -n "password" | base64 
+  root-password: cGFzc3dvcmQ=
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  labels:
+    weblogic.domainUID: ${DOMAIN_UID}
+  name: ${DOMAIN_UID}-mysql-pv
+spec:
+  accessModes:
+  - ReadWriteMany
+  capacity:
+    storage: 10Gi
+  hostPath:
+    path: ${PV_ROOT}/acceptance_test_pv/domain-${DOMAIN_UID}-storage/mysql
+    type: ""
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: ${DOMAIN_UID}-mysql-storage-class
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    weblogic.domainUID: ${DOMAIN_UID}
+  name: ${DOMAIN_UID}-mysql-pvc
   namespace: ${NAMESPACE}
 spec:
-  ports:
-  - port: 3306
-  selector:
-    app: ${DOMAIN_UID}-mysql
-  clusterIP: None
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Gi
+  storageClassName: ${DOMAIN_UID}-mysql-storage-class
+  volumeName: ${DOMAIN_UID}-mysql-pv
 ---
 apiVersion: v1
 kind: Pod
@@ -44,3 +76,17 @@ spec:
   - name: mysql-storage-volume
     persistentVolumeClaim:
       claimName: ${DOMAIN_UID}-mysql-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    weblogic.domainUID: ${DOMAIN_UID}
+  name: ${DOMAIN_UID}-mysql
+  namespace: ${NAMESPACE}
+spec:
+  ports:
+  - port: 3306
+  selector:
+    app: ${DOMAIN_UID}-mysql
+  clusterIP: None

src/integration-tests/introspector/mysql-pvc.yamlt

@@ -25,6 +25,9 @@ while [ 1 -eq 1 ] ; do
 
   echo "CREATE_DOMAIN_EXIT=0"
 
+  # The pod's readiness probe checks for this file:
+  touch /tmp/ready
+
   while [ 1 -eq 1 ] ; do
     sleep 10
   done

src/integration-tests/introspector/mysql-secret.yamlt

@@ -33,6 +33,13 @@ spec:
     image: "${WEBLOGIC_IMAGE_NAME}:${WEBLOGIC_IMAGE_TAG}"
     imagePullPolicy: ${WEBLOGIC_IMAGE_PULL_POLICY}
     name: weblogic-server
+    readinessProbe:
+      exec:
+        command:
+        - cat
+        - /tmp/ready
+      initialDelaySeconds: 5
+      periodSeconds: 1
     volumeMounts:
     - name: my-secret-volume
       mountPath: /weblogic-operator/config-overrides-secrets/my-secret

src/integration-tests/introspector/mysql-pod.yamlt renamed to src/integration-tests/introspector/mysql.yamlt

@@ -3,9 +3,14 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 /weblogic-operator/scripts/introspectDomain.sh
+ret="$?"
 
-# the introspectTest.sh script looks for this exact line:
-echo "INTROSPECT_DOMAIN_EXIT=$?"
+echo "INTROSPECT_DOMAIN_EXIT=$ret"
+
+if [ "$ret" = "0" ]; then
+  # The pod's readiness probe check for this file
+  touch /tmp/ready
+fi
 
 echo In "$0" SLEEPING
 

src/integration-tests/introspector/wl-create-domain-pod.sh

@@ -34,6 +34,13 @@ spec:
     image: "${WEBLOGIC_IMAGE_NAME}:${WEBLOGIC_IMAGE_TAG}"
     imagePullPolicy: ${WEBLOGIC_IMAGE_PULL_POLICY}
     name: weblogic-server
+    readinessProbe:
+      exec:
+        command:
+        - cat
+        - /tmp/ready
+      initialDelaySeconds: 5
+      periodSeconds: 1
     volumeMounts:
     - name: weblogic-credentials-volume
       mountPath: /weblogic-operator/secrets