adding 1853 test

Author: earthmant

.circleci/config.yml

@@ -39,10 +39,13 @@ jobs:
           command: pip install cloudify==4.3.2
       - run:
           name: install test requirements
-          command: pip install nose https://github.com/cloudify-incubator/cloudify-awssdk-plugin/archive/2.3.4.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.zip
+          command: pip install nose https://github.com/cloudify-incubator/cloudify-awssdk-plugin/archive/2.3.4.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.1.zip
       - run:
-          name: execute test
-          command: nosetests -s tests/test_aws.py
+          name: test 4.3.2
+          command: nosetests -s tests/test_aws.py:TestAWS432
+      - run:
+          name: test 18.5.3
+          command: nosetests -s tests/test_aws.py:TestAWS1853
 
   azure:
     docker:
@@ -72,10 +75,13 @@ jobs:
           command: pip install cloudify==4.3.2
       - run:
           name: install test requirements
-          command: pip install nose https://github.com/cloudify-incubator/cloudify-azure-plugin/archive/1.7.2.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.zip
+          command: pip install nose https://github.com/cloudify-incubator/cloudify-azure-plugin/archive/1.7.2.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.1.zip
+      - run:
+          name: test 4.3.2
+          command: nosetests -s tests/test_azure.py:TestAzure432
       - run:
-          name: execute test
-          command: nosetests -s tests/test_azure.py
+          name: test 18.5.3
+          command: nosetests -s tests/test_azure.py:TestAzure1853
 
   gcp:
     docker:
@@ -105,10 +111,13 @@ jobs:
           command: pip install cloudify==4.3.2
       - run:
           name: install test requirements
-          command: pip install nose https://github.com/cloudify-cosmo/cloudify-gcp-plugin/archive/1.4.3.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.zip
+          command: pip install nose https://github.com/cloudify-cosmo/cloudify-gcp-plugin/archive/1.4.3.zip https://github.com/cloudify-cosmo/cloudify-fabric-plugin/archive/1.5.1.zip https://github.com/cloudify-incubator/cloudify-utilities-plugin/archive/1.7.1.zip https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/2.1.1.zip
+      - run:
+          name: test 4.3.2
+          command: nosetests -s tests/test_gcp.py:TestGCP432
       - run:
-          name: execute test
-          command: nosetests -s tests/test_gcp.py
+          name: test 18.5.3
+          command: nosetests -s tests/test_gcp.py:TestGCP1853
 
 workflows:
   version: 2

tests/__init__.py

@@ -44,6 +44,44 @@ def cloudify_rpm_url(self):
         return 'http://repository.cloudifysource.org/cloudify/' \
                '4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm'
 
+    @property
+    def sensitive_data(self):
+
+        # We need to try returning all of these because
+        # we have some common tests in this class.
+
+        try:
+
+            return [
+                os.environ['AWS_SECRET_ACCESS_KEY'],
+                os.environ['AWS_ACCESS_KEY_ID']
+            ]
+        except KeyError:
+            pass
+
+        try:
+            return [
+                os.environ['GCP_CERT_URL'],
+                os.environ['GCP_EMAIL'],
+                os.environ['GCP_CLIENT_ID'],
+                os.environ['GCP_PRIVATE_PROJECT_ID'],
+                os.environ['GCP_PRIVATE_KEY_ID'],
+                os.environ['GCP_PRIVATE_KEY'],
+                os.environ['GCP_PRIVATE_KEY'].decode('string_escape')
+            ]
+        except KeyError:
+            pass
+
+        try:
+            return [
+                os.environ['AZURE_SUB_ID'],
+                os.environ['AZURE_TEN_ID'],
+                os.environ['AZURE_CLI_ID'],
+                os.environ['AZURE_CLI_SE']
+            ]
+        except KeyError:
+            raise
+
     def test_secrets(self):
         for secret in self.secrets_to_check:
             self.assertIsNotNone(eco_utils.get_secrets(secret))

tests/test_aws.py

@@ -1,3 +1,5 @@
+import os
+
 from . import EnvironmentSetupTestBase, eco_utils
 
 
@@ -6,7 +8,7 @@ class AWSTestbase(EnvironmentSetupTestBase):
     def setUp(self):
         os.environ['AWS_DEFAULT_REGION'] = \
             self.inputs.get('ec2_region_name')
-        super(TestAWS432, self).setUp()
+        super(AWSTestbase, self).setUp()
 
     @property
     def node_type_prefix(self):
@@ -28,13 +30,6 @@ def external_id_key(self):
     def server_ip_property(self):
         return 'ip'
 
-    @property
-    def sensitive_data(self):
-        return [
-            os.environ['AWS_SECRET_ACCESS_KEY'],
-            os.environ['AWS_ACCESS_KEY_ID']
-        ]
-
     @property
     def inputs(self):
         try:
@@ -82,3 +77,11 @@ def test_network_deployment(self):
 
 class TestAWS432(AWSTestbase):
     pass
+
+class TestAWS1853(AWSTestbase):
+
+    @property
+    def cloudify_rpm_url(self):
+        return 'http://repository.cloudifysource.org/cloudify/' \
+               '18.5.3/community-release/' \
+               'cloudify-manager-install-community-18.5.3.rpm'

tests/test_azure.py

@@ -1,3 +1,5 @@
+import os
+
 from . import EnvironmentSetupTestBase, eco_utils
 
 
@@ -23,15 +25,6 @@ def external_id_key(self):
     def server_ip_property(self):
         return 'cloudify_host'
 
-    @property
-    def sensitive_data(self):
-        return [
-            os.environ['AZURE_SUB_ID'],
-            os.environ['AZURE_TEN_ID'],
-            os.environ['AZURE_CLI_ID'],
-            os.environ['AZURE_CLI_SE']
-        ]
-
     @property
     def inputs(self):
         try:
@@ -106,3 +99,11 @@ def test_network_deployment(self):
 
 class TestAzure432(AzureTestBase):
     pass
+
+class TestAzure1853(AzureTestBase):
+
+    @property
+    def cloudify_rpm_url(self):
+        return 'http://repository.cloudifysource.org/cloudify/' \
+               '18.5.3/community-release/' \
+               'cloudify-manager-install-community-18.5.3.rpm'

tests/test_gcp.py

@@ -1,8 +1,17 @@
+import os
+
 from . import EnvironmentSetupTestBase, eco_utils
 
 
 class GCPTestBase(EnvironmentSetupTestBase):
 
+    @classmethod
+    def tearDownClass(cls):
+        eco_utils.execute_command(
+            'cfy profiles delete {0}'.format(
+                os.environ['ECOSYSTEM_SESSION_MANAGER_IP']))
+        super(GCPTestBase, cls).tearDownClass()
+
     @property
     def node_type_prefix(self):
         return 'cloudify.gcp.nodes'
@@ -23,17 +32,6 @@ def external_id_key(self):
     def server_ip_property(self):
         return 'cloudify_host'
 
-    @property
-    def sensitive_data(self):
-        return [
-            os.environ['GCP_CERT_URL'],
-            os.environ['GCP_EMAIL'],
-            os.environ['GCP_CLIENT_ID'],
-            os.environ['GCP_PRIVATE_PROJECT_ID'],
-            os.environ['GCP_PRIVATE_KEY_ID'],
-            os.environ['GCP_PRIVATE_KEY'].decode('string_escape')
-        ]
-
     @property
     def inputs(self):
         try:
@@ -97,6 +95,9 @@ def test_network_deployment(self):
             'resource_suffix': self.application_prefix
         }
         self.addCleanup(self.cleanup_deployment, 'gcp-example-network')
+        # eco_utils.execute_command(
+        #     'cfy secrets update gcp_private_key -s {0}'.format(
+        #         os.environ['GCP_PRIVATE_KEY']))
         # Create Deployment (Blueprint already uploaded.)
         if eco_utils.create_deployment(
                 'gcp-example-network',
@@ -113,3 +114,12 @@ def test_network_deployment(self):
 
 class TestGCP432(GCPTestBase):
     pass
+
+
+class TestGCP1853(GCPTestBase):
+
+    @property
+    def cloudify_rpm_url(self):
+        return 'http://repository.cloudifysource.org/cloudify/' \
+               '18.5.3/community-release/' \
+               'cloudify-manager-install-community-18.5.3.rpm'