Merge pull request #903 from oracle/kubernetes-run-script-example

ready to merge:   introspect test update

Author: rjeberhard

src/integration-tests/introspector/README

@@ -37,12 +37,11 @@ Internal Test Flow:
 
    <operator-src>/src/integration-tests/bash/cleanup.sh 
 
-() Create a test directory in the k8s cluster via a k8s pv, pvc, and a job.
+() Create a test directory in the k8s cluster via kubectl run. 
 
-   create-test-root-pv.yamlt, create-test-root-pvc.yamlt
-   create-test-root.sh, create-test-root-job.yamlt
+   See createTestRoot.sh
 
-() Deploy pv/pvc for use by introspector job, the domain create step, and wl pods.  (If PV_COMMENT != "#").
+() Deploy pv/pvc for use by introspector job pod, the domain create step, and wl pods.  (If PV_COMMENT != "#").
 
    wl-pv.yamlt, wl-pvc.yamlt
 
@@ -54,15 +53,15 @@ Internal Test Flow:
 
    wl-create-domain-pod.yamlt, wl-create-domain-pod.sh, wl-create-domain-pod.pyt
 
-() Run the introspector job (as a direct pod instead of a job)
+() Run the introspector job pod (as a direct pod instead of a job)
 
    wl-instrospect-pod.yamlt
    wl-instrospect-pod.sh
    <operator-src>/operator/src/main/resources/scripts/introspectDomain.sh
    <operator-src>/operator/src/main/resources/scripts/startNodeManager.sh
    <operator-src>/operator/src/main/resources/scripts/introspectDomain.py
 
-() Parse the introspector job's output into files and deploy them in a configmap.
+() Parse the introspector job pod's output into files and deploy them in a configmap.
 
 () Start the admin server pod.   The startServer.sh and start-server.py
    scripts will use files from the configmap for situational config and login 

src/integration-tests/introspector/create-test-root-job.yamlt

@@ -1,19 +1,20 @@
 #!/bin/sh
 
-# This script runs inside a job (create-test-root-job.yamlt), it sets up the top
+# This script runs in a pod via krun.sh, it sets up the top
 # level directory for this test that in turn is mounted as /shared by the 
-# test's wl-pvc, wl-pv, wl-job, and wl-pod yamlt (plus similar 'mysql' yamlt).
+# test's wl-pvc, wl-pv, and wl-pod yamlt (plus similar 'mysql' yamlt).
 
 # The 'acceptance_test_pv' directory it creates matches the directory 
 # expected by the integration test 'cleanup.sh' script.
 
-# The 'pv-root' directory is mounted via the create-test-root-job.yamlt, 
-# create-test-root-pv.yamlt, and create-test-root-pvc.yamlt.  It physically
+# The 'pv-root' directory is mounted in the krun.sh command line.  It physically
 # corresponds to the PV_ROOT env var path specified as an input to the test.
 
-mkdir -p /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage/domains || exit 1
-mkdir -p /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage/mysql || exit 1
+DOMAIN_UID=${1?}
+
+mkdir -p /pv-root/acceptance_test_pv/domain-${DOMAIN_UID}-storage/domains || exit 1
+mkdir -p /pv-root/acceptance_test_pv/domain-${DOMAIN_UID}-storage/mysql || exit 1
 chmod 777 /pv-root/acceptance_test_pv || exit 1
-chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage || exit 1
-chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage/domains || exit 1
-chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID?}-storage/mysql || exit 1
+chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID}-storage || exit 1
+chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID}-storage/domains || exit 1
+chmod 777 /pv-root/acceptance_test_pv/domain-${DOMAIN_UID}-storage/mysql || exit 1

src/integration-tests/introspector/create-test-root-pv.yamlt

@@ -162,54 +162,6 @@ function cleanupMinor() {
   echo
 }
 
-#############################################################################
-#
-# Helper function for running a job
-#
-
-function runJob() {
-  trace "Info: Running job '${1?}' for script '${2?}'."
-
-  local job_name=${1?}
-  local job_script=${2?}
-  local yaml_template=${3?}
-  local yaml_file=${4?}
-
-  # Remove old job yaml in case its leftover from a previous run
-
-  rm -f ${test_home}/${yaml_file}
-
-  # Create the job yaml from its template
-
-  env \
-    JOB_SCRIPT=${job_script} \
-    JOB_NAME=${job_name} \
-    ${SCRIPTPATH}/util_subst.sh -g ${yaml_template} ${test_home}/${yaml_file} \
-    || exit 1
-
-  # Run the job
-
-  tracen "Info: Waiting for job '$job_name' to complete."
-  printdots_start
-  env \
-    KUBECONFIG=$KUBECONFIG \
-    JOB_YAML=${test_home}/${yaml_file} \
-    JOB_NAME=${job_name} \
-    NAMESPACE=$NAMESPACE \
-    ${SCRIPTPATH}/util_job.sh \
-    2>&1 > ${test_home}/job-${1}.out
-  local status=$?
-  printdots_end
-
-  if [ ! $status -eq 0 ]; then
-    printdots_end
-    trace "Error:  job failed, job contents"
-    cat ${test_home}/job-${1}.out
-    trace "Error:  end of failed job contents"
-    exit 1
-  fi
-}
-
 #############################################################################
 #
 # Helper function for deploying a yaml template.  Template $1 is converted
@@ -359,25 +311,23 @@ function deployCustomOverridesConfigMap() {
 #
 
 function createTestRootPVDir() {
-
-  trace "Info: Creating k8s cluster physical directory 'PV_ROOT/acceptance_test_pv/domain-${DOMAIN_UID}-storage'."
   trace "Info: PV_ROOT='$PV_ROOT'"
-  trace "Info: Test k8s resources use this physical directory via a PV/PVC '/shared' logical directory."
 
   # TBD on Wercker/Jenkins PV_ROOT will differ and may already exist or be remote
   #     so we need to add logic/booleans to skip the following mkdir/chmod as needed
+
   mkdir -p ${PV_ROOT} || exit 1
   chmod 777 ${PV_ROOT} || exit 1
 
-  # Create test root within PV_ROOT via a job
-
-  deployYamlTemplate create-test-root-pv.yamlt create-test-root-pv.yaml
-  deployYamlTemplate create-test-root-pvc.yamlt create-test-root-pvc.yaml
+  trace "Info: Creating k8s cluster physical directory 'PV_ROOT/acceptance_test_pv/domain-${DOMAIN_UID}-storage' via 'kubectl run'."
+  trace "Info: Test k8s resources use this physical directory via a PV/PVC '/shared' logical directory."
 
-  runJob ${DOMAIN_UID}-create-test-root-job \
-         /test-scripts/createTestRoot.sh \
-         create-test-root-job.yamlt \
-         create-test-root-job.yaml
+  ${SCRIPTPATH}/util_krun.sh -m ${PV_ROOT}:/pv-root \
+                             -i ${WEBLOGIC_IMAGE_NAME}:${WEBLOGIC_IMAGE_TAG} \
+                             -l ${WEBLOGIC_IMAGE_PULL_POLICY} \
+                             -f ${SCRIPTPATH}/createTestRoot.sh \
+                             -c "sh /tmpmount/createTestRoot.sh ${DOMAIN_UID}" \
+                             || exit 1
 }
 
 #############################################################################
@@ -695,18 +645,18 @@ deployDomainConfigMap
 deployTestScriptConfigMap
 deployCustomOverridesConfigMap
 
+kubectl -n $NAMESPACE delete secret my-secret > /dev/null 2>&1
+kubectl -n $NAMESPACE create secret generic my-secret \
+        --from-literal=key1=supersecret  \
+        --from-literal=key2=topsecret 2>&1 | tracePipe "Info: kubectl output: "
+
 if [ ! "$RERUN_INTROSPECT_ONLY" = "true" ]; then
   createTestRootPVDir
   deployMySQL
   deployWebLogic_PV_PVC_and_Secret
   deployCreateDomainJobPod
 fi
 
-kubectl -n $NAMESPACE delete secret my-secret > /dev/null 2>&1
-kubectl -n $NAMESPACE create secret generic my-secret \
-        --from-literal=key1=supersecret  \
-        --from-literal=key2=topsecret 2>&1 | tracePipe "Info: kubectl output: "
-
 deployIntrospectJobPod
 
 #