diff options
| author |   vv770d <vv770d@att.com> | 2020-12-08 21:44:59 +0000 |
|---|---|---|
| committer | vv770d <vv770d@att.com> | 2020-12-08 22:17:41 +0000 |
| commit | 918f38777a822f764818e1fac3bb9d7e0ea2884a (patch) | |
| tree | 8d351a23a1e18ebe2ac4b8efc2176a859b394a39 | |
| parent | 7cd6016f4109e3a47c3e993be41c5b8ebb555c91 (diff) | |
Support both py2 and py3 wagon push
Change-Id: I96a43f4173204070c46ab42df5d7fa6a74ac3342
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-2525
Signed-off-by: vv770d <vv770d@att.com>
| -rw-r--r-- | mvn-phase-lib.sh | 18 |
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 |