Skip to content
This repository was archived by the owner on Feb 2, 2021. It is now read-only.

Commit ccfe3ec

Browse files
author
earthmant
committed
testing dev
update aws add openstack update remove
1 parent 04734a0 commit ccfe3ec

9 files changed

Lines changed: 67 additions & 15 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ jobs:
4444
name: test 4.3.2
4545
command: nosetests -s tests/test_aws.py:TestAWS432
4646
- run:
47-
name: test 18.5.3
48-
command: nosetests -s tests/test_aws.py:TestAWS1853
47+
name: test 4.4.0
48+
command: nosetests -s tests/test_aws.py:TestAWS440
4949

5050
azure:
5151
docker:
@@ -80,8 +80,8 @@ jobs:
8080
name: test 4.3.2
8181
command: nosetests -s tests/test_azure.py:TestAzure432
8282
- run:
83-
name: test 18.5.3
84-
command: nosetests -s tests/test_azure.py:TestAzure1853
83+
name: test 4.4.0
84+
command: nosetests -s tests/test_azure.py:TestAzure440
8585

8686
gcp:
8787
docker:
@@ -116,8 +116,8 @@ jobs:
116116
name: test 4.3.2
117117
command: nosetests -s tests/test_gcp.py:TestGCP432
118118
- run:
119-
name: test 18.5.3
120-
command: nosetests -s tests/test_gcp.py:TestGCP1853
119+
name: test 4.4.0
120+
command: nosetests -s tests/test_gcp.py:TestGCP440
121121

122122
workflows:
123123
version: 2

‎aws.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ tosca_definitions_version: cloudify_dsl_1_3
22

33
imports:
44
- http://www.getcloudify.org/spec/cloudify/4.3.2/types.yaml
5-
- http://www.getcloudify.org/spec/awssdk-plugin/2.3.4/plugin.yaml
6-
- http://www.getcloudify.org/spec/utilities-plugin/1.8.2/plugin.yaml
5+
- http://www.getcloudify.org/spec/awssdk-plugin/2.4.0/plugin.yaml
6+
- http://www.getcloudify.org/spec/utilities-plugin/1.9.0/plugin.yaml
77
- http://www.getcloudify.org/spec/fabric-plugin/1.5.1/plugin.yaml
88
- imports/manager-configuration.yaml
99

‎azure.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
33
imports:
44
- http://www.getcloudify.org/spec/cloudify/4.3.2/types.yaml
55
- http://www.getcloudify.org/spec/azure-plugin/1.7.3/plugin.yaml
6-
- http://www.getcloudify.org/spec/utilities-plugin/1.8.2/plugin.yaml
6+
- http://www.getcloudify.org/spec/utilities-plugin/1.9.0/plugin.yaml
77
- http://www.getcloudify.org/spec/fabric-plugin/1.5.1/plugin.yaml
88
- imports/manager-configuration.yaml
99

‎gcp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
33
imports:
44
- http://www.getcloudify.org/spec/cloudify/4.3.2/types.yaml
55
- http://www.getcloudify.org/spec/gcp-plugin/1.4.3/plugin.yaml
6-
- http://www.getcloudify.org/spec/utilities-plugin/1.8.2/plugin.yaml
6+
- http://www.getcloudify.org/spec/utilities-plugin/1.9.0/plugin.yaml
77
- http://www.getcloudify.org/spec/fabric-plugin/1.5.1/plugin.yaml
88
- imports/manager-configuration.yaml
99

‎openstack.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ tosca_definitions_version: cloudify_dsl_1_3
22

33
imports:
44
- http://www.getcloudify.org/spec/cloudify/4.3.2/types.yaml
5-
- http://www.getcloudify.org/spec/openstack-plugin/2.9.3/plugin.yaml
6-
- http://www.getcloudify.org/spec/utilities-plugin/1.8.2/plugin.yaml
5+
- http://www.getcloudify.org/spec/openstack-plugin/2.9.4/plugin.yaml
6+
- http://www.getcloudify.org/spec/utilities-plugin/1.9.0/plugin.yaml
77
- http://www.getcloudify.org/spec/fabric-plugin/1.5.1/plugin.yaml
88
- imports/manager-configuration.yaml
99

‎scripts/manager/tasks.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ def update_config(private, public, _config_path):
2828

2929
SED = "sed -i 's|{0}|{1}|g' {2}"
3030

31+
old_sanity = " skip_sanity: false"
32+
new_sanity = " skip_sanity: true"
33+
34+
try:
35+
sudo(SED.format(old_sanity, new_sanity, _config_path))
36+
except Exception as e:
37+
raise NonRecoverableError(str(e))
38+
3139
old_private_ip = " private_ip: \\x27\\x27"
3240
new_private_ip = " private_ip: \\x27{0}\\x27".format(private)
3341

‎tests/test_aws.py‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,14 @@ def test_network_deployment(self):
7575
if eco_utils.execute_uninstall('aws-example-network'):
7676
raise Exception('Uninstall aws-example-network failed.')
7777

78+
7879
class TestAWS432(AWSTestbase):
79-
pass
80+
81+
@property
82+
def cloudify_rpm_url(self):
83+
return 'http://repository.cloudifysource.org/cloudify/' \
84+
'4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm'
85+
8086

8187
class TestAWS1853(AWSTestbase):
8288

@@ -85,3 +91,12 @@ def cloudify_rpm_url(self):
8591
return 'http://repository.cloudifysource.org/cloudify/' \
8692
'18.5.3/community-release/' \
8793
'cloudify-manager-install-community-18.5.3.rpm'
94+
95+
96+
class TestAWS440(AWSTestbase):
97+
98+
@property
99+
def cloudify_rpm_url(self):
100+
return 'http://repository.cloudifysource.org/cloudify/' \
101+
'4.4.0/rc2-release/' \
102+
'cloudify-manager-install-4.4rc2.rpm'

‎tests/test_azure.py‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,14 @@ def test_network_deployment(self):
9797
if eco_utils.execute_uninstall('azure-example-network'):
9898
raise Exception('Uninstall azure-example-network failed.')
9999

100+
100101
class TestAzure432(AzureTestBase):
101-
pass
102+
103+
@property
104+
def cloudify_rpm_url(self):
105+
return 'http://repository.cloudifysource.org/cloudify/' \
106+
'4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm'
107+
102108

103109
class TestAzure1853(AzureTestBase):
104110

@@ -107,3 +113,12 @@ def cloudify_rpm_url(self):
107113
return 'http://repository.cloudifysource.org/cloudify/' \
108114
'18.5.3/community-release/' \
109115
'cloudify-manager-install-community-18.5.3.rpm'
116+
117+
118+
class TestAzure440(AzureTestBase):
119+
120+
@property
121+
def cloudify_rpm_url(self):
122+
return 'http://repository.cloudifysource.org/cloudify/' \
123+
'4.4.0/rc2-release/' \
124+
'cloudify-manager-install-4.4rc2.rpm'

‎tests/test_gcp.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,12 @@ def test_network_deployment(self):
113113

114114

115115
class TestGCP432(GCPTestBase):
116-
pass
116+
117+
@property
118+
def cloudify_rpm_url(self):
119+
return 'http://repository.cloudifysource.org/cloudify/' \
120+
'4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm'
121+
117122

118123

119124
class TestGCP1853(GCPTestBase):
@@ -123,3 +128,12 @@ def cloudify_rpm_url(self):
123128
return 'http://repository.cloudifysource.org/cloudify/' \
124129
'18.5.3/community-release/' \
125130
'cloudify-manager-install-community-18.5.3.rpm'
131+
132+
133+
class TestGCP440(GCPTestBase):
134+
135+
@property
136+
def cloudify_rpm_url(self):
137+
return 'http://repository.cloudifysource.org/cloudify/' \
138+
'4.4.0/rc2-release/' \
139+
'cloudify-manager-install-4.4rc2.rpm'

0 commit comments

Comments
 (0)