Merge pull request #241 from oracle/tbarnes/inttest-minor

Tbarnes/inttest minor

Author: rjeberhard

src/integration-tests/bash/archive.sh

@@ -6,7 +6,7 @@
 # archive.sh <source_dir> <target_dir>
 #   - internal helper method called by run.sh
 #   - archives directory ${1} into ${2}/IntSuite.TIMESTAMP.tar.gz
-#   - deletes all but the 5 newest archives
+#   - deletes all but the 10 newest archives
 #   - this method doesn't have any configurable env vars
 #
 
@@ -38,7 +38,7 @@ function archive {
   [ $? -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
+  find $ARCHIVE_DIR -maxdepth 1 -name "IntSuite*tar.gz" | sort -r | awk '{ if (NR>10) print $NF }' | xargs rm -f
 
   trace Archived to \'$ARCHIVE\'.
 }

src/integration-tests/bash/run.sh

@@ -1392,7 +1392,7 @@ function call_operator_rest {
 
     trace "Calling some operator REST APIs via ${REST_ADDR}/${URL_TAIL}"
 
-    #pod=`kubectl get pod -n $OPERATOR_NS | grep $OPERATOR_NS | awk '{ print $1 }'`
+    #pod=`kubectl get pod -n $OPERATOR_NS --show-labels=true | grep $OPERATOR_NS | awk '{ print $1 }'`
     #kubectl logs $pod -n $OPERATOR_NS > "${OPERATOR_TMP_DIR}/operator.pre.rest.log"
 
     # turn off all of the https proxying so that curl will work
@@ -1950,7 +1950,7 @@ function verify_service_and_pod_created {
     done
 
     if [ "${srv_count:=Error}" != "1" ]; then
-      local pod=`kubectl get pod -n $OPERATOR_NS | grep $OPERATOR_NS | awk '{ print $1 }'`
+      local pod=`kubectl get pod -n $OPERATOR_NS --show-labels=true | grep $OPERATOR_NS | awk '{ print $1 }'`
       local debuglog="${OPERATOR_TMP_DIR}/verify_domain_debugging.log"
       kubectl logs $pod -n $OPERATOR_NS > "${debuglog}"
       if [ -f ${debuglog} ] ; then
@@ -1975,7 +1975,7 @@ function verify_service_and_pod_created {
     fi
 
     if [ "${srv_count:=Error}" != "1" ]; then
-      local pod=`kubectl get pod -n $OPERATOR_NS | grep $OPERATOR_NS | awk '{ print $1 }'`
+      local pod=`kubectl get pod -n $OPERATOR_NS --show-labels=true | grep $OPERATOR_NS | awk '{ print $1 }'`
       local debuglog="${OPERATOR_TMP_DIR}/verify_domain_debugging.log"
       kubectl logs $pod -n $OPERATOR_NS > "${debuglog}"
       if [ -f ${debuglog} ] ; then