Added travis testing for GCE

.travis.yml

@@ -6,10 +6,13 @@ os:
 env:
   - TOX_ENV=py27-aws
   - TOX_ENV=py27-openstack
+  - TOX_ENV=py27-gce
   - TOX_ENV=py36-aws
   - TOX_ENV=py36-openstack
+  - TOX_ENV=py36-gce
   - TOX_ENV=pypy-aws
   - TOX_ENV=pypy-openstack
+  - TOX_ENV=pypy-gce
 matrix:
   fast_finish: true
   allow_failures:

setup.py

@@ -16,8 +16,8 @@ with open(os.path.join('cloudbridge', '__init__.py')) as f:
             break
 
 base_reqs = ['bunch>=1.0.1', 'six>=1.10.0', 'retrying>=1.3.3']
-openstack_reqs = ['requests<2.13.0',
-                  'Babel>=2.3.4,<2.4.0',
+openstack_reqs = ['requests',
+                  'Babel',
                   'python-novaclient==7.0.0',
                   'python-glanceclient>=2.5.0,<=2.6.0',
                   'python-cinderclient>=1.9.0,<=2.0.1',
@@ -28,8 +28,8 @@ aws_reqs = ['boto>=2.38.0,<=2.46.1']
 gce_reqs = ['google-api-python-client>=1.4.2', "cryptography>=1.4"]
 full_reqs = base_reqs + aws_reqs + openstack_reqs + gce_reqs
 # httpretty is required with/for moto 1.0.0 or AWS tests fail
-dev_reqs = (['tox>=2.1.1', 'moto<1.0.0', 'sphinx>=1.3.1', 'flake8>=3.3.0',
-             'flake8-import-order>=0.12', 'httpretty==0.8.10'] + full_reqs)
+dev_reqs = (full_reqs + ['tox>=2.1.1', 'moto<1.0.0', 'sphinx>=1.3.1',
+            'flake8>=3.3.0', 'flake8-import-order>=0.12', 'httpretty==0.8.10'])
 
 setup(name='cloudbridge',
       version=version,

tox.ini

@@ -25,7 +25,7 @@ passenv =
     CB_USE_MOCK_PROVIDERS
     aws: CB_IMAGE_AWS CB_INSTANCE_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
     openstack:  CB_IMAGE_OS CB_INSTANCE_TYPE_OS CB_PLACEMENT_OS OS_AUTH_URL OS_PASSWORD OS_PROJECT_NAME OS_TENANT_NAME OS_USERNAME OS_REGION_NAME OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_NAME NOVA_SERVICE_NAME
-    gce: CB_IMAGE_GCE CB_INSTANCE_TYPE_GCE CB_PLACEMENT_GCE GCE_CLIENT_EMAIL GCE_PROJECT_NAME GCE_DEFAULT_ZONE GCE_SERVICE_CREDS_FILE
+    gce: CB_IMAGE_GCE CB_INSTANCE_TYPE_GCE CB_PLACEMENT_GCE GCE_DEFAULT_ZONE GCE_SERVICE_CREDS_FILE GCE_SERVICE_CREDS_DICT
 deps =
     -rrequirements.txt
     coverage