using phx serverjre for wercker

Author: vanajamukkara

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

@@ -69,10 +69,10 @@ function state_dump {
   # use a run to archive PV, /sharedparent mounts to PV_ROOT in the K8S cluster
   echo "Archiving pv directory using a kubernetes run.  Look for it on k8s cluster in $PV_ROOT/acceptance_test_pv_archive"
   local outfile=${DUMP_DIR}/archive_pv_run.out
-  $SCRIPTPATH/krun.sh -m "${PV_ROOT}:/sharedparent" -c 'jar cf /sharedparent/pvarchive.jar /sharedparent/acceptance_test_pv' 2>&1 | tee ${outfile}
+  $SCRIPTPATH/krun.sh -t 300 -d ${RESULT_ROOT} -m "${PV_ROOT}:/sharedparent" -c 'jar cf /sharedparent/pvarchive.jar /sharedparent/acceptance_test_pv' 2>&1 | tee ${outfile}
   if [ "$?" = "0" ]; then
      id
-     $SCRIPTPATH/krun.sh -m  "${PV_ROOT}:/sharedparent" -c 'base64 /sharedparent/pvarchive.jar' > $RESULT_ROOT/pvarchive.b64 2>&1
+     $SCRIPTPATH/krun.sh -t 300 -d ${RESULT_ROOT} -m  "${PV_ROOT}:/sharedparent" -c 'base64 /sharedparent/pvarchive.jar' > $RESULT_ROOT/pvarchive.b64 2>&1
 	 if [ "$?" = "0" ]; then
    		base64 -di $RESULT_ROOT/pvarchive.b64 > $ARCHIVE
    		if [ "$?" = "0" ]; then

src/integration-tests/bash/cleanup.sh

@@ -61,6 +61,7 @@ USER_PROJECTS_DIR="$RESULT_DIR/user-projects"
 TMP_DIR="$RESULT_DIR/cleanup_tmp"
 JOB_NAME="weblogic-command-job"
 
+
 function fail {
   echo @@ cleanup.sh: Error "$@"
   exit 1
@@ -350,7 +351,11 @@ if [ "${DELETE_FILES:-true}" = "true" ]; then
 
   echo @@ Launching run to delete all pv contents.  This runs in the k8s cluster, /sharedparent mounts PV_ROOT.
   # $SCRIPTPATH/job.sh "rm -fr /scratch/acceptance_test_pv"
-  $SCRIPTPATH/krun.sh -i store/oracle/weblogic:12.2.1.3 -m "${PV_ROOT}:/sharedparent" -c 'rm -fr /sharedparent/acceptance_test_pv'
+  if [ "$WERCKER" = "true" ]; then
+    $SCRIPTPATH/krun.sh -i phx.ocir.io/weblogick8s/serverjre:8 -m "${PV_ROOT}:/sharedparent" -c 'rm -fr /sharedparent/acceptance_test_pv'
+  else 
+  	$SCRIPTPATH/krun.sh -m "${PV_ROOT}:/sharedparent" -c 'rm -fr /sharedparent/acceptance_test_pv'
+  fi
   [ "$?" = "0" ] || SUCCESS="1"
   echo @@ SUCCESS=$SUCCESS
 

src/integration-tests/bash/krun.sh

@@ -30,33 +30,40 @@ VCOMMA=''
 CMFILES=''
 VOLUMECOUNT=0
 
+TMPDIR='/tmp'
+
 EXITCODE=0
 
 usage_exit() {
 cat << EOF
 
-  Usage: $(basename $0) [-i image] [-n namespace] [-c command]
-                        [-m pvc-name:mount-path]
-                        [-f local-file-name]
-                        [-t timeout]
+  Usage: $(basename $0) ...options...
 
-  Run a 'one-off' command on a kubernetes cluster via a temporary pod, 
-  optionally specify pvc mounts and additional files to load.
+    Runs a 'one-off' command on a kubernetes cluster via a temporary pod.
+    Provides options to specify pvc mounts, hostpath mounts, or additional
+    files to load.
 
   Parameters:
 
     -i imagename           - Image, default is "$IMAGE".
     -l imagepullpolicy     - Image pull policy, default is "$IMAGEPULLPOLICY".
     -s imagesecret         - Image pull secret. No default.
+
     -n namespace           - Namespace, default is "$NAMESPACE".
     -p podname             - Pod name, default is "$PODNAME".
+
     -c command             - Command, default is "$COMMAND".
-    -t timeout             - Timeout in seconds, default is $MAXSECS seconds.
+
     -m pvc-name:mount-path - PVC name and mount location. No default.
     -m host-path:mount-path- Remote host-path and mount location. No default.
                              Host-path must begin with a '/'. 
     -f /path/filename      - Copies local file to pod at /tmpmount/filename
 
+    -t timeout             - Timeout in seconds, default is $MAXSECS seconds.
+
+    -d tmpdir              - Location to put tmp file(s).  Default is "$TMPDIR".
+                             Use this if your command's output might be large.
+
     You can specify -f, -m, and -s more than once.
 
   Limitation:
@@ -103,7 +110,7 @@ delete_pod_and_cm() {
   kubectl delete -n ${NAMESPACE} cm ${PODNAME}-cm --ignore-not-found > /dev/null 2>&1
 }
 
-while getopts m:t:i:c:n:f:p: OPT
+while getopts m:t:i:c:n:f:p:l:s:d: OPT
 do
   case $OPT in
   i) IMAGE=$OPTARG
@@ -121,6 +128,8 @@ do
      ;;
   t) MAXSECS=$OPTARG
      ;;
+  d) TMPDIR=$OPTARG
+     ;;
   f) # local file to make available in /tmpmount
      if [ "$CMFILES" = "" ]; then
        VOL_MOUNTS="${VOL_MOUNTS}${VCOMMA}{\"name\": \"my-config-map-vol\",\"mountPath\": \"/tmpmount\"}"
@@ -161,7 +170,9 @@ shift $(($OPTIND - 1))
 
 # setup a tmp file /tmp/[script-file-name].[name-space].[pod-name].tmp.[pid]
 
-TEMPFILE="/tmp/$(basename $0).${NAMESPACE}.${PODNAME}.tmp.$$"  
+[ ! -d "$TMPDIR" ] && echo "Error: temp dir \"$TMPDIR\" not found. Check parameters." && exit 1
+
+TEMPFILE="${TMPDIR}/$(basename $0).${NAMESPACE}.${PODNAME}.tmp.$$"  
 
 # cleanup anything from previous run