From: vv770d <vv770d@att.com>
Date: Tue, 8 Dec 2020 21:44:59 +0000 (+0000)
Subject: Support both py2 and py3 wagon push
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F116233%2F2;p=dcaegen2%2Fplatform%2Fplugins.git

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>
---

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