From e7d2df16545709874a880a92388ddc6817ef5684 Mon Sep 17 00:00:00 2001
From: Leonel Ochoa <leonel.ochoa@intel.com>
Date: Mon, 23 Nov 2015 15:17:51 -0800
Subject: [PATCH] LU-7468 tests: update maloo_upload.sh to create upload.tar.gz

Uploaded files are now expected to have the '.tar.gz' extension.
This patch updates maloo_upload.sh to create upload.tar.gz before
uploading.

Signed-off-by: Leonel Ochoa <leonel.ochoa@intel.com>
Change-Id: Id8b6dd08dde873fad9e85438360e451945903e9c
Reviewed-on: http://review.whamcloud.com/17344
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 lustre/tests/maloo_upload.sh | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/lustre/tests/maloo_upload.sh b/lustre/tests/maloo_upload.sh
index dc81ed0..e16b45a 100755
--- a/lustre/tests/maloo_upload.sh
+++ b/lustre/tests/maloo_upload.sh
@@ -1,31 +1,39 @@
 #!/bin/sh
 
+set -e
+
 FILENAME=$1
 
 if [ -r ~/.maloorc ] ; then
-        source ~/.maloorc
+	source ~/.maloorc
 else
-        echo "Error: ~/.maloorc not found.  Please obtain this file from the maloo web interface, under 'Upload results'"
-        exit 1
+	echo "Error: ~/.maloorc not found." \
+	     "Please obtain this file from the maloo web interface," \
+	     "under 'Upload results'"
+	exit 1
 fi
 
 if [ -z $FILENAME ] ; then
-        echo "Usage: ${0} <tarball or directory>"
-        exit 2
+	echo "Usage: ${0} <tarball or directory>"
+	exit 2
 fi
 
-
 if [ ! -r $FILENAME ] ; then
-        echo "Input file '$FILENAME' not found"
-        exit 3
+	echo "Input file '$FILENAME' not found"
+	exit 3
 fi
 
 echo Uploading $FILENAME to $MALOO_URL
 if [ -d $FILENAME ] ; then
 	pushd $FILENAME
-	tar czf - * | curl -F "user_id=${MALOO_USER_ID}" -F "upload=@-" -F "user_upload_token=${MALOO_UPLOAD_TOKEN}" ${MALOO_URL} > /dev/null
+	tar czf upload.tar.gz * |
+		curl -F "user_id=${MALOO_USER_ID}" -F "upload=@upload.tar.gz" \
+		     -F "user_upload_token=${MALOO_UPLOAD_TOKEN}" ${MALOO_URL} \
+		     > /dev/null
 	popd
 else
-	curl -F "user_id=${MALOO_USER_ID}" -F "upload=@${FILENAME}" -F "user_upload_token=${MALOO_UPLOAD_TOKEN}" ${MALOO_URL} > /dev/null
+	curl -F "user_id=${MALOO_USER_ID}" -F "upload=@${FILENAME}" \
+	     -F "user_upload_token=${MALOO_UPLOAD_TOKEN}" ${MALOO_URL} \
+	     > /dev/null
 fi
 echo Complete.
-- 
1.8.3.1