Merge pull request #49 from cloudify-cosmo/0.0.7-build

0.0.7 build

.circleci/config.yml

@@ -1,10 +1,20 @@
 version: 2.1
 
+unittest-post-steps: &unittest-post-steps
+  post-steps:
+    - store_test_results:
+        path: /home/circleci/project/nosetests.xml
+    - store_artifacts:
+        path: /home/circleci/project/coverage.xml
+        prefix: tests
+    - slack/notify_failed
+
 orbs:
-  node: cloudify/public-unittest-orb@1 #orb version
-  wagonorb: cloudify/wagon-bulder-orb@2 #orb version
-  releaseorb: cloudify/release-orb@1 #orb version
-  managerorb: cloudify/manager-orb@2
+  node: cloudify/public-unittest-orb@volatile
+  wagonorb: cloudify/wagon-bulder-orb@volatile
+  releaseorb: cloudify/release-orb@volatile
+  managerorb: cloudify/manager-orb@volatile
+  slack: cloudify/notify-slack@2
 
 checkout:
   post:
@@ -35,7 +45,10 @@ commands:
 
   run_tf_vm_test:
     steps:
-      - run: ecosystem-test local-blueprint-test -b examples/tg_blueprint.yaml --test-id=tg --on-failure=uninstall-force --timeout=1800 --required-ips 2
+      - run: ecosystem-test local-blueprint-test -b examples/tg_blueprint.yaml --test-id=tg --on-failure=uninstall-force --timeout=1800 --required-ips 2 | tee -a run_tf_vm_test.log
+      - store_artifacts:
+          path: run_tf_vm_test.log
+      - slack/notify_failed
 
 jobs:
   integration_tests_py3:
@@ -53,7 +66,10 @@ workflows:
   tests:
     jobs:
       - node/check_py3_compat_job
-      - node/unittests_job
+      - node/unittests_job:
+          context: 
+            - slack-secrets
+          <<: *unittest-post-steps
       - node/validate_documentation_job
       - node/validate_version_job
       - wagonorb/wagon:
@@ -68,26 +84,22 @@ workflows:
           filters:
             branches:
               only: /([0-9\.]*\-build|main|dev)/
-      - wagonorb/build_bundle:
+      - integration_tests_py3:
+          context: 
+            - slack-secrets
+          <<: *unittest-post-steps
           filters:
             branches:
               only: /([0-9\.]*\-build|main|dev)/
           requires:
             - wagonorb/wagon
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon
-      - integration_tests_py3:
-          filters:
-            branches:
-              only: /([0-9\.]*\-build|main|dev)/
-          requires:
-            - wagonorb/build_bundle
       - releaseorb/release:
           filters:
             branches:
               only: /main/
           requires:
-            - wagonorb/build_bundle
             - node/unittests_job
             - wagonorb/wagon
             - wagonorb/arch64_wagon
@@ -111,7 +123,10 @@ workflows:
               - main
     jobs:
       - node/check_py3_compat_job
-      - node/unittests_job
+      - node/unittests_job:
+          context: 
+            - slack-secrets
+          <<: *unittest-post-steps
       - wagonorb/wagon:
           filters:
             branches:
@@ -124,17 +139,11 @@ workflows:
           filters:
             branches:
               only: /([0-9\.]*\-build|main|dev)/
-      - wagonorb/build_bundle:
-          filters:
-            branches:
-              only: /main/
-          requires:
-            - wagonorb/wagon
-            - wagonorb/rhel_wagon
-            - wagonorb/arch64_wagon
       - integration_tests_py3:
+          context: 
+            - slack-secrets
+          <<: *unittest-post-steps
           requires:
-            - wagonorb/build_bundle
             - wagonorb/wagon
             - wagonorb/rhel_wagon
             - wagonorb/arch64_wagon

CHANGELOG.txt

@@ -7,3 +7,4 @@
  - Support variables.
  - Hide secrets in resource_config
 0.0.6: Release 1 4 in place of v2.
+0.0.7: add __version__.py file in cloudify_tg folder.

cloudify_tg/__version__.py

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

plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   tg:
     executor: central_deployment_agent
     package_name: cloudify-terragrunt-plugin
-    package_version: '0.0.6'
+    package_version: '0.0.7'
 
 dsl_definitions:
 

plugin_1_4.yaml

@@ -3,7 +3,7 @@ plugins:
   tg:
     executor: central_deployment_agent
     package_name: cloudify-terragrunt-plugin
-    package_version: '0.0.6'
+    package_version: '0.0.7'
 
 dsl_definitions:
 

setup.py

@@ -15,24 +15,17 @@
 
 
 import os
+import re
+import pathlib
 from setuptools import setup
 
 
-def read(rel_path):
-    here = os.path.abspath(os.path.dirname(__file__))
-    with open(os.path.join(here, rel_path), 'r') as fp:
-        return fp.read()
-
-
-def get_version(rel_file='plugin.yaml'):
-    lines = read(rel_file)
-    for line in lines.splitlines():
-        if 'package_version' in line:
-            split_line = line.split(':')
-            line_no_space = split_line[-1].replace(' ', '')
-            line_no_quotes = line_no_space.replace('\'', '')
-            return line_no_quotes.strip('\n')
-    raise RuntimeError('Unable to find version string.')
+def get_version():
+    current_dir = pathlib.Path(__file__).parent.resolve()
+    with open(os.path.join(current_dir,'cloudify_tg/__version__.py'),
+              'r') as outfile:
+        var = outfile.read()
+        return re.search(r'\d+.\d+.\d+', var).group()
 
 
 setup(

v2_plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   tg:
     executor: central_deployment_agent
     package_name: cloudify-terragrunt-plugin
-    package_version: '0.0.6'
+    package_version: '0.0.7'
 
 dsl_definitions: