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

Commit 2ee4aaf

Browse files
authored
Merge pull request #35 from cloudify-examples/update-azure-add-monitoring-44
update 4.4
2 parents 015141e + 84dcc60 commit 2ee4aaf

File tree

7 files changed

+16
-74
lines changed

7 files changed

+16
-74
lines changed

.circleci/config.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ jobs:
4040
- run:
4141
name: install test requirements
4242
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
43-
- run:
44-
name: test 4.3.2
45-
command: nosetests -s tests/test_aws.py:TestAWS432
4643
- run:
4744
name: test 4.4.0
4845
command: nosetests -s tests/test_aws.py:TestAWS440
@@ -76,9 +73,6 @@ jobs:
7673
- run:
7774
name: install test requirements
7875
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
79-
- run:
80-
name: test 4.3.2
81-
command: nosetests -s tests/test_azure.py:TestAzure432
8276
- run:
8377
name: test 4.4.0
8478
command: nosetests -s tests/test_azure.py:TestAzure440
@@ -112,9 +106,6 @@ jobs:
112106
- run:
113107
name: install test requirements
114108
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
115-
- run:
116-
name: test 4.3.2
117-
command: nosetests -s tests/test_gcp.py:TestGCP432
118109
- run:
119110
name: test 4.4.0
120111
command: nosetests -s tests/test_gcp.py:TestGCP440

azure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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/azure-plugin/1.7.3/plugin.yaml
5+
- http://www.getcloudify.org/spec/azure-plugin/1.8.0/plugin.yaml
66
- 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

imports/manager-configuration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ inputs:
77
rpm:
88
description: >
99
If inputs.bootstrap is false, this is the CLI RPM to install and bootstrap with.
10-
default: http://repository.cloudifysource.org/cloudify/4.3.2/ga-release/cloudify-manager-install-4.3.2ga.rpm
10+
default: http://repository.cloudifysource.org/cloudify/4.4.0/ga-release/cloudify-manager-install-4.4ga.rpm
1111

1212
blueprints:
1313
default:

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_monitoring = " skip_installation: true"
32+
new_monitoring = " skip_installation: false"
33+
34+
try:
35+
sudo(SED.format(old_monitoring, new_monitoring, _config_path))
36+
except Exception as e:
37+
raise NonRecoverableError(str(e))
38+
3139
old_sanity = " skip_sanity: false"
3240
new_sanity = " skip_sanity: true"
3341

tests/test_aws.py

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -76,28 +76,9 @@ def test_network_deployment(self):
7676
raise Exception('Uninstall aws-example-network failed.')
7777

7878

79-
class TestAWS432(AWSTestbase):
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-
86-
87-
88-
class TestAWS1853(AWSTestbase):
89-
90-
@property
91-
def cloudify_rpm_url(self):
92-
return 'http://repository.cloudifysource.org/cloudify/' \
93-
'18.5.3/community-release/' \
94-
'cloudify-manager-install-community-18.5.3.rpm'
95-
96-
9779
class TestAWS440(AWSTestbase):
9880

9981
@property
10082
def cloudify_rpm_url(self):
101-
return 'http://repository.cloudifysource.org/cloudify/' \
102-
'4.4.0/rc2-release/' \
103-
'cloudify-manager-install-4.4rc2.rpm'
83+
return 'http://repository.cloudifysource.org/cloudify/4.4.0/' \
84+
'ga-release/cloudify-manager-install-4.4ga.rpm'

tests/test_azure.py

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -98,28 +98,9 @@ def test_network_deployment(self):
9898
raise Exception('Uninstall azure-example-network failed.')
9999

100100

101-
class TestAzure432(AzureTestBase):
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-
108-
109-
110-
class TestAzure1853(AzureTestBase):
111-
112-
@property
113-
def cloudify_rpm_url(self):
114-
return 'http://repository.cloudifysource.org/cloudify/' \
115-
'18.5.3/community-release/' \
116-
'cloudify-manager-install-community-18.5.3.rpm'
117-
118-
119101
class TestAzure440(AzureTestBase):
120102

121103
@property
122104
def cloudify_rpm_url(self):
123-
return 'http://repository.cloudifysource.org/cloudify/' \
124-
'4.4.0/rc2-release/' \
125-
'cloudify-manager-install-4.4rc2.rpm'
105+
return 'http://repository.cloudifysource.org/cloudify/4.4.0/' \
106+
'ga-release/cloudify-manager-install-4.4ga.rpm'

tests/test_gcp.py

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -112,28 +112,9 @@ def test_network_deployment(self):
112112
raise Exception('Uninstall gcp-example-network failed.')
113113

114114

115-
class TestGCP432(GCPTestBase):
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-
122-
123-
124-
class TestGCP1853(GCPTestBase):
125-
126-
@property
127-
def cloudify_rpm_url(self):
128-
return 'http://repository.cloudifysource.org/cloudify/' \
129-
'18.5.3/community-release/' \
130-
'cloudify-manager-install-community-18.5.3.rpm'
131-
132-
133115
class TestGCP440(GCPTestBase):
134116

135117
@property
136118
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'
119+
return 'http://repository.cloudifysource.org/cloudify/4.4.0/' \
120+
'ga-release/cloudify-manager-install-4.4ga.rpm'

0 commit comments

Comments
 (0)