Merge pull request #122 from oracle/integration-test-2

Integration test 2

Author: rjeberhard

src/integration-tests/bash/archive.sh

@@ -24,20 +24,23 @@ function fail {
 function archive {
   local SOURCE_DIR="${1?}"
   local ARCHIVE_DIR="${2?}"
-  local ARCHIVE="$ARCHIVE_DIR/IntSuite.`date '+%Y%m%d%H%M%S'`.tar.gz"
+  local ARCHIVE_FILE="IntSuite.`date '+%Y%m%d%H%M%S'`.tar.gz"
+  local ARCHIVE="$ARCHIVE_DIR/$ARCHIVE_FILE"
+  local OUTFILE="/tmp/$ARCHIVE_FILE"
 
-  trace About to archive a copy of \'$SOURCE_DIR\' to \'$ARCHIVE\'.
+  trace About to archive \'$SOURCE_DIR\'.
 
   [ ! -d "$SOURCE_DIR" ] && fail Could not archive, could not find source directory \'$SOURCE_DIR\'.
 
   mkdir -p $ARCHIVE_DIR || fail Could not archive, could not create target directory \'$ARCHIVE_DIR\'.
 
-  tar -czf $ARCHIVE $SOURCE_DIR 2>&1 
-  [ $? -eq 0 ] || fail "Could not archive, 'tar -czf $ARCHIVE $SOURCE_DIR' command failed."
+  tar -czf $ARCHIVE $SOURCE_DIR > $OUTFILE 2>&1 
+  [ $? -eq 0 ] || fail "Could not archive, 'tar -czf $ARCHIVE $SOURCE_DIR' command failed: `cat $OUTFILE`"
+  rm -f $OUTFILE
 
   find $ARCHIVE_DIR -maxdepth 1 -name "IntSuite*tar.gz" | sort -r | awk '{ if (NR>5) print $NF }' | xargs rm -f
 
-  trace Archived copy of \'$SOURCE_DIR\' to \'$ARCHIVE\'.
+  trace Archived to \'$ARCHIVE\'.
 }
 
 archive "$1" "$2"

src/integration-tests/bash/job.sh

@@ -26,7 +26,7 @@ JOB_NAME="weblogic-command-job"
 
 # Customizable env vars.  See run.sh for an explanation.
 
-echo "@@ Begin command job.  Job name='$JOB_NAME'.  Command='$*'."
+echo "@@ Begin kubernetes job to run a command.  Job name='$JOB_NAME'.  Command='$*'."
 
 echo "@@ At script entry:  RESULT_ROOT='$RESULT_ROOT'"
 echo "@@ At script entry:  PV_ROOT='$PV_ROOT'"
@@ -103,15 +103,7 @@ function launchCommandJob {
       break
     fi
 
-    local pods=$(kubectl get pods  --show-all --selector=job-name=$JOB_NAME --output=jsonpath={.items..metadata.name})
-    local pod_status="unknown"
-    local pod
-    for pod in $pods; do
-      pod_status=`kubectl get pods --show-all --selector=job-name=$JOB_NAME | grep "$JOB_NAME" | awk '{ print $3 }'`
-      if [ "$pod_status" = "Completed" -o "$pod_status" = "Error" -o "$pod_status" = "ErrImagePull" ]; then
-        break
-      fi
-    done
+    local pod_status=`kubectl get pods --show-all --selector=job-name=$JOB_NAME | grep "$JOB_NAME" | awk '{ print $3 }'`
 
     if [ "$pod_status" = "Completed" ]; then
       echo "@@ Success.  job_status=$job_status pod_status=$pod_status"
@@ -140,10 +132,10 @@ function launchCommandJob {
   for pod in $pods; do
     echo @@
     echo "@@ Calling 'kubectl get pod $pod'"
-    kubectl get pod $pod 2>&1 
+    kubectl get pod $pod 2>&1
     echo @@
     echo "@@ Calling 'kubectl logs pod $pod'"
-    kubectl logs $pod 2>&1 
+    kubectl logs $pod 2>&1
     echo @@
   done