Build py3 wagons in-parallel

And disable helm2 plugin build

Change-Id: I36f70225fdea3cd5141d5d697fc060ed0a3f22f6
Signed-off-by: vv770d <vv770d@att.com>
Issue-ID: DCAEGEN2-2525
Issue-ID: DCAEGEN2-2544
Signed-off-by: vv770d <vv770d@att.com>

diff --git a/clamp-policy/requirements.txt b/clamp-policy/requirements.txt
index e9526b8..b65dd5d 100644 (file)
--- a/clamp-policy/requirements.txt
+++ b/clamp-policy/requirements.txt
@@ -1,3 +1,3 @@
 requests>=2.11.0
 cloudify-common>=5.0.0; python_version<"3"
-cloudify-common @ git+https://github.com/cloudify-cosmo/cloudify-common@cy-1374-python3#egg=cloudify-common==5.0.0; python_version>="3"
+cloudify-common>=5.1.0; python_version>="3"

diff --git a/dcae-policy/requirements.txt b/dcae-policy/requirements.txt
index e9526b8..b65dd5d 100644 (file)
--- a/dcae-policy/requirements.txt
+++ b/dcae-policy/requirements.txt
@@ -1,3 +1,3 @@
 requests>=2.11.0
 cloudify-common>=5.0.0; python_version<"3"
-cloudify-common @ git+https://github.com/cloudify-cosmo/cloudify-common@cy-1374-python3#egg=cloudify-common==5.0.0; python_version>="3"
+cloudify-common>=5.1.0; python_version>="3"

diff --git a/helm/requirements.txt b/helm/requirements.txt
index 1432553..a4e0a01 100644 (file)
--- a/helm/requirements.txt
+++ b/helm/requirements.txt
@@ -14,4 +14,4 @@ pyyaml>=3.12
 # When such a version is released, the single requirement should suffice.
 # The install_requires in setup.py may also be uncommented then.
 cloudify-common>=5.0.5,<5.1.0; python_version<"3"
-cloudify-common @ git+https://github.com/cloudify-cosmo/cloudify-common@cy-1374-python3#egg=cloudify-common==5.0.5; python_version>="3"
+cloudify-common>=5.1.0; python_version>="3"

diff --git a/k8s/requirements.txt b/k8s/requirements.txt
index 2bd2f75..7d6f4cf 100644 (file)
--- a/k8s/requirements.txt
+++ b/k8s/requirements.txt
@@ -3,4 +3,4 @@ python-consul>=0.6.0
 onap-dcae-dcaepolicy-lib>=2.4.1
 kubernetes==12.0.1
 cloudify-common>=5.0.0; python_version<"3"
-cloudify-common @ git+https://github.com/cloudify-cosmo/cloudify-common@cy-1374-python3#egg=cloudify-common==5.0.0; python_version>="3"
+cloudify-common>=5.1.0; python_version>="3"

diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh
index a7eaa34..2401c2e 100644 (file)
--- a/mvn-phase-lib.sh
+++ b/mvn-phase-lib.sh
@@ -269,9 +269,39 @@ build_wagons()
   rm -rf venv-pkg
 }
 
+build_py3_wagons()
+{
+  rm -rf ./*.wgn venv3-pkg
+  SETUPFILES=$(find . -name "setup.py")
+
+  virtualenv -p python3 ./venv3-pkg
+  source ./venv3-pkg/bin/activate
+  pip install --upgrade pip
+  pip install wagon
+
+  CURDIR=$(pwd)
+  for SETUPFILE in $SETUPFILES; do
+    PLUGIN_DIR=$(dirname "$SETUPFILE")
+    PLUGIN_NAME=$(grep 'name[[:space:]]*=' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g')
+    PLUGIN_VERSION=$(grep 'version[[:space:]]*=' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g')
+
+    echo "In $PLUGIN_DIR, build plugin $PLUGIN_NAME, version $PLUGIN_VERSION"
+
+    wagon create -r "${PLUGIN_DIR}/requirements.txt" --format tar.gz "${PLUGIN_DIR}"
+
+    PKG_FILE_NAMES=( "${PLUGIN_NAME}-${PLUGIN_VERSION}"*.wgn )
+    echo Built package: "${PKG_FILE_NAMES[@]}"
+    cd "$CURDIR"
+  done
+
+  deactivate
+  rm -rf venv3-pkg
+}
+
+
 build_archives_for_wagons()
 {
-  rm -rf ./*.tgz ./*.zip venv-pkg
+  rm -rf ./*.tgz ./*.zip venv-pkg venv3-pkg
 
   SETUPFILES=$(find "$(pwd)" -name "setup.py")
   CURDIR=$(pwd)

diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index cf6b1a8..4eaa92b 100755 (executable)
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -60,6 +60,7 @@ package)
   echo "==> package phase script"
   build_archives_for_wagons
   build_wagons
+  build_py3_wagons
   ;;
 install)
   echo "==> install phase script"

diff --git a/pom.xml b/pom.xml
index 91dbd4f..1ddc303 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,6 @@ limitations under the License.
      <module>clamp-policy</module>
      <module>dcae-policy</module>
      <module>dmaap</module>
-     <module>helm</module>
      <module>k8s</module>
      <module>relationships</module>
      <module>sshkeyshare</module>

diff --git a/relationships/requirements.txt b/relationships/requirements.txt
index 2a92bd4..c0cf23b 100644 (file)
--- a/relationships/requirements.txt
+++ b/relationships/requirements.txt
@@ -1,3 +1,3 @@
 python-consul>=0.6.1
 cloudify-common>=5.0.0; python_version<"3"
-cloudify-common @ git+https://github.com/cloudify-cosmo/cloudify-common@cy-1374-python3#egg=cloudify-common==5.0.0; python_version>="3"
+cloudify-common>-5.1.0; python_version>="3"