Merge pull request #108 from cloudify-incubator/0.4.12-build

prep blackduck updates

CHANGELOG.txt

@@ -55,3 +55,4 @@
 0.4.9: Rerelease for manylinux.
 0.4.10: Rerelease without cfylint.
 0.4.11: add .drp folder for trufflehog.
+0.4.12: blackduck.

Makefile

@@ -1,13 +1,80 @@
-download:
-ifeq (,$(wildcard ./fusion-agent))
-	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-agent.git && cd './fusion-agent' && git checkout rel/magicp1-2.0.0 && cd ..
+# Makefile for collecting and installing requirements for nativeedge-plugins-sdk.
+VENVS := $(shell pyenv virtualenvs --skip-aliases --bare | grep 'project\b')
+FUSION_COMMON := fusion-common
+FUSION_AGENT := fusion-agent
+FUSION_MANAGER := fusion-manager
+NATIVEEDGE_SDK := cloudify-utilities-plugins-sdk
+INCUBATOR_DOMAIN := github.com/cloudify-incubator
+BRANCH := master
+SHELL := /bin/bash
+DOMAIN=${GH_TOKEN}@github.com/fusion-e
+
+default:
+	make download_from_git
+	make setup_local_virtual_env
+	make run_tests
+
+compile:
+	make download_from_git
+	make setup_local_virtual_env
+
+download_from_git:
+	make download_fusion_common
+	make download_fusion_agent
+	make download_fusion_manager
+	make download_nativeedge_sdk
+
+setup_local_virtual_env:
+ifneq ($(VENVS),)
+	@echo We have $(VENVS)
+	pyenv virtualenv-delete -f project && pyenv deactivate
 endif
-ifeq (,$(wildcard ./fusion-common))
-	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-common.git && cd './fusion-common' && git checkout rel/magicp1-2.0.0 && cd ..
+	pyenv virtualenv 3.11 project
+
+download_fusion_common:
+ifneq ($(wildcard ${HOME}/${FUSION_COMMON}*),)
+	@echo "Found ${HOME}/${FUSION_COMMON}."
+else
+	git clone --depth 1 https://${DOMAIN}/${FUSION_COMMON}.git ${HOME}/${FUSION_COMMON} -b ${BRANCH} && cd ${HOME}/${FUSION_COMMON} && cd
 endif
-ifeq (,$(wildcard ./fusion-manager))
-	git clone https://${GH_USER}:${GITHUB_PASSWORD}@eos2git.cec.lab.emc.com/ISG-Edge/fusion-manager.git && cd './fusion-manager' && git checkout rel/magicp1-2.0.0 && cd ..
+
+download_fusion_agent:
+ifneq ($(wildcard ${HOME}/${FUSION_AGENT}*),)
+	@echo "Found ${HOME}/${FUSION_AGENT}."
+else
+	git clone --depth 1 https://${DOMAIN}/${FUSION_AGENT}.git ${HOME}/${FUSION_AGENT} -b ${BRANCH} && cd ${HOME}/${FUSION_AGENT} && cd
 endif
-ifeq (,$(wildcard ./cloudify-utilities-plugins-sdk))
-	git clone https://github.com/cloudify-incubator/cloudify-utilities-plugins-sdk.git && cd './cloudify-utilities-plugins-sdk' && git checkout fusion && cd ..
+
+download_fusion_manager:
+ifneq ($(wildcard ${HOME}/${FUSION_MANAGER}*),)
+	@echo "Found ${HOME}/${FUSION_MANAGER}."
+else
+	git clone --depth 1 https://${DOMAIN}/${FUSION_MANAGER}.git ${HOME}/${FUSION_MANAGER} -b ${BRANCH} && cd ${HOME}/${FUSION_MANAGER}/mgmtworker && cd
 endif
+
+download_nativeedge_sdk:
+ifneq ($(wildcard ${HOME}/${NATIVEEDGE_SDK}*),)
+	@echo "Found ${HOME}/${NATIVEEDGE_SDK}."
+else
+	git clone --depth 1 https://${INCUBATOR_DOMAIN}/${NATIVEEDGE_SDK}.git ${HOME}/${NATIVEEDGE_SDK} -b master && cd ${HOME}/${NATIVEEDGE_SDK} && cd
+endif
+
+cleanup:
+	pyenv virtualenv-delete -f project
+	rm -rf ${FUSION_MANAGER} ${FUSION_AGENT} ${FUSION_COMMON}
+
+run_tests:
+	@echo "Starting executing the tests."
+	git submodule init
+	git submodule update --remote --recursive | true
+	HOME=${HOME} VIRTUAL_ENV=${HOME}/.pyenv/${VENVS} tox
+
+clrf:
+	@find . \( -path ./.tox -prune -o -path ./.git -prune \) -o -type f -exec dos2unix {} \;
+
+wheels:
+	@echo "Creating wheels..."
+	@pip wheel ${HOME}/${FUSION_COMMON}/ -w /workspace/build/ --find-links /workspace/build
+	@pip wheel ${HOME}/${FUSION_AGENT}/ -w /workspace/build/ --find-links /workspace/build
+	@pip wheel ${HOME}/${FUSION_MANAGER}/mgmtworker -w /workspace/build/ --find-links /workspace/build
+	@pip wheel ${HOME}/${NATIVEEDGE_SDK} -w /workspace/build/ --find-links /workspace/build

cloudify_helm/__version__.py

@@ -0,0 +1 @@
+ version = '0.4.12'

plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   helm:
     executor: central_deployment_agent
     package_name: cloudify-helm-plugin
-    package_version: 0.4.11
+    package_version: 0.4.12
 
 dsl_definitions:
   helm_configuration:

plugin_1_4.yaml

@@ -2,7 +2,7 @@ plugins:
   helm:
     executor: central_deployment_agent
     package_name: cloudify-helm-plugin
-    package_version: '0.4.11'
+    package_version: '0.4.12'
 
 dsl_definitions:
 

plugin_1_5.yaml

@@ -2,7 +2,7 @@ plugins:
   helm:
     executor: central_deployment_agent
     package_name: cloudify-helm-plugin
-    package_version: '0.4.11'
+    package_version: '0.4.12'
 
 dsl_definitions:
 

requirements.in

@@ -1,5 +1,5 @@
-cryptography>=41.0.4
--e fusion-common
--e fusion-agent
--e fusion-manager/mgmtworker
--e cloudify-utilities-plugins-sdk
+-e ${HOME}/fusion-common
+-e ${HOME}/fusion-manager/mgmtworker
+-e ${HOME}/fusion-agent
+-e ${HOME}/cloudify-utilities-plugins-sdk
+cryptography>=42.0.5