summaryrefslogtreecommitdiffstats
path: root/mvn-phase-lib.sh
diff options
context:
space:
mode:
Diffstat (limited to 'mvn-phase-lib.sh')
-rw-r--r--mvn-phase-lib.sh18
1 files changed, 14 insertions, 4 deletions
diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh
index 2401c2e..e5b7709 100644
--- a/mvn-phase-lib.sh
+++ b/mvn-phase-lib.sh
@@ -242,7 +242,7 @@ run_tox_test()
build_wagons()
{
- rm -rf ./*.wgn venv-pkg
+ rm -rf ./*py27*.wgn venv-pkg
SETUPFILES=$(find . -name "setup.py")
virtualenv ./venv-pkg
@@ -271,10 +271,11 @@ build_wagons()
build_py3_wagons()
{
- rm -rf ./*.wgn venv3-pkg
+ rm -rf ./*py36*.wgn venv3-pkg
SETUPFILES=$(find . -name "setup.py")
- virtualenv -p python3 ./venv3-pkg
+ # Cloudify support only 3.6
+ virtualenv -p python3.6 ./venv3-pkg
source ./venv3-pkg/bin/activate
pip install --upgrade pip
pip install wagon
@@ -432,7 +433,8 @@ upload_wagons_and_type_yamls()
fi
TYPEFILE_PACKAGE_VERSION=$(grep 'package_version[[:space:]]*:' "$TYPEFILE_NAME" |cut -f2 -d ':' |sed -r 's/\s+//g')
- WAGONFILE_NAME=$(ls -1 "${PLUGIN_NAME}"-"${TYPEFILE_PACKAGE_VERSION}"-*.wgn)
+ WAGONFILE_NAME=$(ls -1 "${PLUGIN_NAME}"-"${TYPEFILE_PACKAGE_VERSION}"-py27*.wgn)
+
if [ -z "$WAGONFILE_NAME" ]; then
echo "!!! No wagonfile found with matching package name and version as required in typefile: "
echo " $TYPEFILE_NAME plugin $PLUGIN_NAME package version ${TYPEFILE_PACKAGE_VERSION}"
@@ -443,6 +445,14 @@ upload_wagons_and_type_yamls()
upload_raw_file "${WAGONFILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}"
rm -r "$WAGONFILE_NAME"
+
+ # Upload py3 wagon
+ PY3WAGONFILE_NAME=$(ls -1 "${PLUGIN_NAME}"-"${TYPEFILE_PACKAGE_VERSION}"-py36*.wgn)
+ if [ "$PY3WAGONFILE_NAME" ]; then
+ upload_raw_file "${PY3WAGONFILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}"
+ rm -r "$PY3WAGONFILE_NAME"
+ fi
+
if [ "$TYPEFILE_NAME" != "$NEWFILENAME" ]; then
rm -f "$NEWFILENAME"
fi