summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2018-03-19 13:40:31 -0400
committerLusheng Ji <lji@research.att.com>2018-03-19 13:40:41 -0400
commita3361d3fba982fc930bfa0c7da82dfc697c043c3 (patch)
tree73284e8fb7fc753095b73aa3774d8119aa4fc155
parenta57e06732dfb49d872a3dd264f9676a2be745551 (diff)
Fix archive containing unwanted files
Issue-ID: DCAEGEN2-206 Change-Id: I0fcf8462109773e849e72d35014b11779881aa00 Signed-off-by: Lusheng Ji <lji@research.att.com>
-rw-r--r--scripts/mvn-phase-lib.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/scripts/mvn-phase-lib.sh b/scripts/mvn-phase-lib.sh
index a0084df..26490ce 100644
--- a/scripts/mvn-phase-lib.sh
+++ b/scripts/mvn-phase-lib.sh
@@ -273,11 +273,7 @@ build_wagons()
build_archives_for_wagons()
{
- rm -rf ./*.wgn venv-pkg
- virtualenv ./venv-pkg
- source ./venv-pkg/bin/activate
- pip install --upgrade pip
- pip install wagon
+ rm -rf ./*.tgz ./*.zip venv-pkg
SETUPFILES=$(find . -name "setup.py")
CURDIR=$(pwd)
@@ -295,9 +291,6 @@ build_archives_for_wagons()
echo "Built archives for package ${PLUGIN_NAME}-${PLUGIN_VERSION}"
cd "$CURDIR"
done
-
- deactivate
- rm -rf venv-pkg
}
@@ -319,6 +312,10 @@ upload_raw_file()
OUTPUT_FILE_TYPE='text/x-shellscript'
elif [ "$EXT" == 'gz' ]; then
OUTPUT_FILE_TYPE='application/gzip'
+ elif [ "$EXT" == 'tgz' ]; then
+ OUTPUT_FILE_TYPE='application/gzip'
+ elif [ "$EXT" == 'zip' ]; then
+ OUTPUT_FILE_TYPE='application/zip'
elif [ "$EXT" == 'wgn' ]; then
OUTPUT_FILE_TYPE='application/gzip'
else