Merge pull request #78 from cloudify-cosmo/replace-wagon-builder-to-p…

…y2py3-builder

Replace wagon builder to py2py3 builder

.circleci/config.yml

@@ -1,4 +1,4 @@
-version: 2
+version: 2.1
 
 checkout:
   post:
@@ -9,20 +9,30 @@ checkout:
         git checkout -qf FETCH_HEAD
       fi
 
-jobs:
-  flake8:
+executors:
+  py27:
     docker:
       - image: circleci/python:2.7
+
+  py36:
+    docker:
+      - image: circleci/python:3.6
+
+  wagon_generator:
+    machine:
+      image: ubuntu-1604:201903-01
+
+commands:
+
+  flake8:
     steps:
       - checkout
       - run: pip install flake8 --user
       - run:
           name: Run flake8
           command: flake8 fabric_plugin
 
-  unittests:
-    docker:
-      - image: circleci/python:2.7
+  run_unittests:
     steps:
       - checkout
       - run:
@@ -40,9 +50,167 @@ jobs:
       - store_test_results:
           path: test-results
 
+  check_py3_compat:
+    steps:
+      - run:
+          name: install futurize
+          command: pip install future --user
+      - run:
+          # those modules contain code that futurize would want to change,
+          # so let's just remove them so that it doesn't report on them
+          # (there's no "exclude" functionality in futurize)
+          name: remove compat modules
+          command: |
+            rm fabric_plugin/_compat.py
+      - run:
+          name: find python3-incompatible code
+          command: |
+            FUTURIZE="futurize ."
+            while read line; do
+              [[ "$line" =~ ^#.* ]] && continue
+              FUTURIZE="${FUTURIZE} ${line}"
+            done<.circleci/py3fixers
+            echo "Running: $FUTURIZE"
+            $FUTURIZE>futurize_diffs
+      - run:
+          name: check that there is no python3-incompatible code
+          command: |
+            if [[ -s futurize_diffs ]]; then
+              echo "Python-3-incompatible code found"
+              cat futurize_diffs
+              exit 1
+            fi
+  generate_py27py36_wagon:
+    steps:
+      - run:
+          name: Create Workspace Build directory.
+          command: mkdir -p workspace/build
+      - run:
+          name: Build py27py36 Wagon
+          command: |
+              git clone https://github.com/cloudify-cosmo/cloudify-wagon-build-containers.git
+              docker build -t cloudify-centos-7-wagon-builder cloudify-wagon-build-containers/centos_7_py2py3
+              docker run -v ~/project/:/packaging cloudify-centos-7-wagon-builder
+      - run:
+          name: copy wagon to workspace
+          command: cp *.wgn workspace/build/
+      - persist_to_workspace:
+          root: workspace
+          paths:
+            - build/*
+
+  generate_rhel_py27py36_wagon:
+    steps:
+      - run:
+          name: Create Workspace Build directory.
+          command: mkdir -p workspace/build
+      - run:
+          name: Build RHEL py27py36 Wagon
+          command: |
+              git clone https://github.com/cloudify-cosmo/cloudify-wagon-build-containers.git
+              docker build -t cloudify-redhat-7-wagon-builder cloudify-wagon-build-containers/redhat_7_py2py3 --build-arg USERNAME="$USERNAME" --build-arg PASSWORD="$PASSWORD"
+              docker run -v ~/project/:/packaging cloudify-redhat-7-wagon-builder
+      - run:
+          name: copy wagon to workspace
+          command: cp *.wgn workspace/build/
+      - persist_to_workspace:
+          root: workspace
+          paths:
+            - build/*
+
+  release_plugin:
+    steps:
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule init
+            git submodule update --remote --recursive
+      - run:
+          name: Download pip
+          command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
+      - run:
+          name: Install pip
+          command: sudo python get-pip.py
+      - run:
+          name: Install virtualenv
+          command: pip install --user virtualenv
+      - run:
+          name: Init virtualenv
+          command: virtualenv env
+      - run:
+          name: install tox
+          command: pip install --user pygithub pyyaml==3.10
+      - run:
+          name: upgrade setuptools
+          command: pip install --upgrade setuptools
+      - run:
+          name: install local project
+          command: pip install https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/latest.zip
+      - attach_workspace:
+          at: workspace
+      - run: python .circleci/package_release.py
+jobs:
+
+  unittests_py27:
+    executor: py27
+    steps:
+      - checkout
+      - flake8
+      - run_unittests
+
+  unittests_py36:
+    executor: py36
+    steps:
+      - checkout
+      - flake8
+      - run_unittests
+
+  py3_compat:
+    executor: py27
+    steps:
+      - checkout
+      - check_py3_compat
+
+  wagon:
+    executor: wagon_generator
+    steps:
+      - checkout
+      - generate_py27py36_wagon
+
+  rhel_wagon:
+    executor: wagon_generator
+    steps:
+      - checkout
+      - generate_rhel_py27py36_wagon
+
+  release:
+    executor: py27
+    steps:
+      - checkout
+      - release_plugin
+
 workflows:
-  version: 2
+  version: 2.1
   tests:
-    jobs:
-      - flake8
-      - unittests
+    jobs: &all_jobs
+      - py3_compat
+      - unittests_py27
+      - unittests_py36
+      - wagon:
+          filters:
+            branches:
+              only: /([0-9\.]*\-build|master|dev)/
+      - rhel_wagon:
+          filters:
+            branches:
+              only: /([0-9\.]*\-build|master|dev)/
+      - release:
+          filters:
+            branches:
+              only: /master/
+          requires:
+            - wagon
+            - rhel_wagon
+            - unittests_py27
+            - unittests_py36
+

.circleci/package_release.py

@@ -0,0 +1,12 @@
+from os import path, pardir
+from ecosystem_cicd_tools.release import (
+    plugin_release_with_latest, find_version)
+
+setup_py = path.join(
+    path.abspath(path.join(path.dirname(__file__), pardir)),
+    'setup.py')
+
+
+if __name__ == '__main__':
+    plugin_release_with_latest(
+        'cloudify-fabric-plugin', find_version(setup_py))

.circleci/py3fixers

@@ -0,0 +1,21 @@
+--stage1
+-f lib2to3.fixes.fix_getcwdu
+-f lib2to3.fixes.fix_long
+-f lib2to3.fixes.fix_nonzero
+-f lib2to3.fixes.fix_input
+-f lib2to3.fixes.fix_raw_input
+-f lib2to3.fixes.fix_itertools
+-f lib2to3.fixes.fix_itertools_imports
+-f lib2to3.fixes.fix_exec
+-f lib2to3.fixes.fix_operator
+-f libfuturize.fixes.fix_execfile
+-f libpasteurize.fixes.fix_newstyle
+-f lib2to3.fixes.fix_filter
+-f lib2to3.fixes.fix_map
+-f lib2to3.fixes.fix_zip
+-f lib2to3.fixes.fix_xrange
+-f lib2to3.fixes.fix_basestring
+-f libfuturize.fixes.fix_cmp
+-f libfuturize.fixes.fix_division_safe
+-f lib2to3.fixes.fix_metaclass
+-f libfuturize.fixes.fix_unicode_keep_u

dev-requirements.txt

@@ -1 +0,0 @@
-git+https://github.com/cloudify-cosmo/cloudify-common@master#egg=cloudify-common==master

fabric_plugin/_compat.py

@@ -31,6 +31,7 @@ def exec_(code, globs):
 """)
 
 else:
+    import builtins
     from io import StringIO
     exec_ = getattr(builtins, 'exec')
 

fabric_plugin/tests/test_fabric_plugin.py

@@ -108,8 +108,8 @@ def test_missing_tasks_file(self):
             self._execute('test.run_task', tasks_file='missing.py')
 
     def test_bad_tasks_file(self):
-        with self.assertRaisesRegexp(NonRecoverableError,
-                                     "ImportError: No module named module"):
+
+        with self.assertRaisesRegexp(NonRecoverableError, "No module named"):
             self._execute('test.run_task', tasks_file='corrupted_file.py')
 
     def test_missing_task(self):

plugin.yaml

@@ -4,6 +4,6 @@
 plugins:
     fabric:
         executor: central_deployment_agent
-        source: https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/2.0.1.zip
+        source: https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/2.0.3.zip
         package_name: cloudify-fabric-plugin
-        package_version: '2.0.1'
+        package_version: '2.0.3'

setup.py

@@ -17,14 +17,14 @@
 
 setup(
     name='cloudify-fabric-plugin',
-    version='2.0.2',
+    version='2.0.3',
     author='Cloudify',
     author_email='[email protected]',
     packages=['fabric_plugin'],
     license='LICENSE',
     description='Plugin for remotely running fabric tasks and commands',
     install_requires=[
-        'cloudify-common>=5.1.0.dev1',
+        'cloudify-common>=4.5.5',
         'fabric==2.5.0',
     ]
 )