copy archives to JENKINS_RESULTS_DIR for jenkins run

Author: vanajamukkara

integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

@@ -608,8 +608,11 @@ public static void tearDown(String iTClassName) throws Exception {
     StringBuffer cmd =
         new StringBuffer(
             "export RESULT_ROOT=$RESULT_ROOT && export PV_ROOT=$PV_ROOT && export IT_CLASS=");
-    cmd.append(iTClassName)
-        .append(" && ")
+    cmd.append(iTClassName);
+    if (JENKINS) {
+      cmd.append(" && export JENKINS_RESULTS_DIR=${WORKSPACE}/${BUILD_TAG} ");
+    }
+    cmd.append(" && ")
         .append(BaseTest.getProjectRoot())
         .append("/integration-tests/src/test/resources/statedump.sh");
     logger.info("Running " + cmd);

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

@@ -116,12 +116,12 @@ function state_dump {
    			fi
    			if [ "$JENKINS" = "true" ]; then
 	   			# Jenkins can only publish logs under the workspace
-				mkdir -p ${WORKSPACE}/logdir/
-				cp $ARCHIVE ${WORKSPACE}/logdir/
+				mkdir -p ${JENKINS_RESULTS_DIR}
+				cp $ARCHIVE ${JENKINS_RESULTS_DIR}
 				if [ "$?" = "0" ]; then
-	   				echo Copy complete. Archive $ARCHIVE copied to ${WORKSPACE}/logdir/
+	   				echo Copy complete. Archive $ARCHIVE copied to ${JENKINS_RESULTS_DIR}
 	   			else 
-	   				echo Failed to copy archive $ARCHIVE to ${WORKSPACE}/logdir/
+	   				echo Failed to copy archive $ARCHIVE to ${JENKINS_RESULTS_DIR}
 	   			fi
 	   		fi
 	 	else
@@ -155,7 +155,11 @@ function state_dump {
   rm -rf ${RESULT_DIR}/samples
 
   # now archive all the local test files
-  $SCRIPTPATH/archive.sh "${RESULT_DIR}" "${RESULT_DIR}_archive"
+  if [ "$JENKINS" = "true" ]; then
+  	$SCRIPTPATH/archive.sh "${RESULT_DIR}" "${JENKINS_RESULTS_DIR}"
+  else 
+  	$SCRIPTPATH/archive.sh "${RESULT_DIR}" "${RESULT_DIR}_archive"
+  fi
 
   echo Done with state dump
 }

src/integration-tests/bash/archive.sh

@@ -38,17 +38,12 @@ function archive {
   [ $? -eq 0 ] || fail "Could not archive, 'jar cf $ARCHIVE $SOURCE_DIR' command failed: `cat $OUTFILE`"
   rm -f $OUTFILE
 
-  find $ARCHIVE_DIR -maxdepth 1 -name "IntSuite*jar" | sort -r | awk '{ if (NR>10) print $NF }' | xargs rm -f
-  if [ "$JENKINS" = "true" ]; then
-  	# Jenkins can only publish logs under the workspace
-	mkdir -p ${WORKSPACE}/logdir/
-	cp $ARCHIVE ${WORKSPACE}/logdir/
-	if [ "$?" = "0" ]; then
-		echo Copy complete. Archive $ARCHIVE copied to ${WORKSPACE}/logdir/
-	else 
-		echo Failed to copy archive $ARCHIVE to ${WORKSPACE}/logdir/
-	fi
+  # Jenkins log cleanup is managed on Jenkins job config
+  if [ ! "$JENKINS" = "true" ]; then
+	  find $ARCHIVE_DIR -maxdepth 1 -name "IntSuite.${IT_CLASS}.PV.*jar" | sort -r | awk '{ if (NR>5) print $NF }' | xargs rm -f
+	  find $ARCHIVE_DIR -maxdepth 1 -name "IntSuite.${IT_CLASS}.TMP.*jar" | sort -r | awk '{ if (NR>5) print $NF }' | xargs rm -f
   fi
+ 
 
   trace Archived to \'$ARCHIVE\'.
 }