Merge branch 'master' into new-path

Author: EarthmanT

.circleci/config.yml

@@ -163,19 +163,19 @@ commands:
             pip install -r test-requirements.txt
       - run:
           name: download manager docker image
-          command:  wget http://repository.cloudifysource.org/cloudify/5.1.0/.dev1-release/cloudify-docker-manager-5.1.0.dev1.tar
+          command:  wget http://repository.cloudifysource.org/cloudify/5.1.0/.dev1-release/cloudify-manager-aio-docker-5.1.0.dev1.tar
       - run:
           name: load docker image
-          command: docker load -i cloudify-docker-manager-5.1.0.dev1.tar
+          command: docker load -i cloudify-manager-aio-docker-5.1.0.dev1.tar
       - run:
           name: retain space by dumping the tar
-          command: rm cloudify-docker-manager-5.1.0.dev1.tar
+          command: rm cloudify-manager-aio-docker-5.1.0.dev1.tar
       - run:
           name: show images
           command: docker images
       - run:
           name: start docker container
-          command: docker run --name cfy_manager -d --restart unless-stopped -v /sys/fs/cgroup:/sys/fs/cgroup:ro --tmpfs /run --tmpfs /run/lock --security-opt seccomp:unconfined --cap-add SYS_ADMIN --network host cloudifyplatform/premium-cloudify-manager-aio
+          command: docker run --name cfy_manager -d --restart unless-stopped -v /sys/fs/cgroup:/sys/fs/cgroup:ro --tmpfs /run --tmpfs /run/lock --security-opt seccomp:unconfined --cap-add SYS_ADMIN --network host cloudify-manager-aio:latest
       - run:
           name: install local project
           command: pip install https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/latest.zip

.circleci/test_examples.py

@@ -22,15 +22,6 @@
     cleanup_on_failure, prepare_test
 )
 
-'''Temporary until all the plugins in the bundle will 
-released with py2py3 wagons'''
-UT_VERSION = '1.23.5'
-UT_WAGON = 'https://github.com/cloudify-incubator/cloudify-utilities-plugin/' \
-           'releases/download/{v}/cloudify_utilities_plugin-{v}-centos' \
-           '-Core-py27.py36-none-linux_x86_64.wgn'.format(v=UT_VERSION)
-UT_PLUGIN = 'https://github.com/cloudify-incubator/cloudify-utilities-' \
-            'plugin/releases/download/{v}/plugin.yaml'.format(v=UT_VERSION)
-PLUGINS_TO_UPLOAD = [(UT_WAGON, UT_PLUGIN)]
 SECRETS_TO_CREATE = {
     'openstack_username': False,
     'openstack_password': False,
@@ -44,8 +35,7 @@
     'openstack_project_domain_name': False,
 }
 
-prepare_test(plugins=PLUGINS_TO_UPLOAD, secrets=SECRETS_TO_CREATE,
-             execute_bundle_upload=False)
+prepare_test(secrets=SECRETS_TO_CREATE)
 
 blueprint_list = ['examples/blueprint-examples/virtual-machine/openstack.yaml']