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

Commit b54c441

Browse files
author
earthmant
committed
make cloudify_host dependent on nat
1 parent 05a8f24 commit b54c441

6 files changed

Lines changed: 461 additions & 33 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
version: 2
2+
3+
checkout:
4+
post:
5+
- >
6+
if [ -n "$CI_PULL_REQUEST" ]; then
7+
PR_ID=${CI_PULL_REQUEST##*/}
8+
git fetch origin +refs/pull/$PR_ID/merge:
9+
git checkout -qf FETCH_HEAD
10+
fi
11+
12+
jobs:
13+
14+
aws:
15+
docker:
16+
- image: amd64/centos:centos7.3.1611
17+
steps:
18+
- checkout
19+
- run:
20+
name: Install dependencies
21+
command: yum -y install python-devel gcc openssl git libxslt-devel libxml2-devel openldap-devel libffi-devel openssl-devel libvirt-devel
22+
- run:
23+
name: Download pip
24+
command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
25+
- run:
26+
name: Install pip
27+
command: python get-pip.py
28+
- run:
29+
name: Upgrade pip
30+
command: pip install --upgrade pip==9.0.1
31+
- run:
32+
name: Install virtualenv
33+
command: pip install virtualenv
34+
- run:
35+
name: Init virtualenv
36+
command: virtualenv env
37+
- run:
38+
name: install cloudify
39+
command: pip install cloudify==4.3.2
40+
- run:
41+
name: install test requirements
42+
command: pip install nose 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.0.zip
43+
- run:
44+
name: execute test
45+
command: nosetests -s tests/test_env.py:TestAWS
46+
47+
azure:
48+
docker:
49+
- image: amd64/centos:centos7.3.1611
50+
steps:
51+
- checkout
52+
- run:
53+
name: Install dependencies
54+
command: yum -y install python-devel gcc openssl git libxslt-devel libxml2-devel openldap-devel libffi-devel openssl-devel libvirt-devel
55+
- run:
56+
name: Download pip
57+
command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
58+
- run:
59+
name: Install pip
60+
command: python get-pip.py
61+
- run:
62+
name: Upgrade pip
63+
command: pip install --upgrade pip==9.0.1
64+
- run:
65+
name: Install virtualenv
66+
command: pip install virtualenv
67+
- run:
68+
name: Init virtualenv
69+
command: virtualenv env
70+
- run:
71+
name: install cloudify
72+
command: pip install cloudify==4.3.2
73+
- run:
74+
name: install test requirements
75+
command: pip install nose 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.0.zip
76+
- run:
77+
name: execute test
78+
command: nosetests -s tests/test_env.py:TestAzure
79+
80+
gcp:
81+
docker:
82+
- image: amd64/centos:centos7.3.1611
83+
steps:
84+
- checkout
85+
- run:
86+
name: Install dependencies
87+
command: yum -y install python-devel gcc openssl git libxslt-devel libxml2-devel openldap-devel libffi-devel openssl-devel libvirt-devel
88+
- run:
89+
name: Download pip
90+
command: curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
91+
- run:
92+
name: Install pip
93+
command: python get-pip.py
94+
- run:
95+
name: Upgrade pip
96+
command: pip install --upgrade pip==9.0.1
97+
- run:
98+
name: Install virtualenv
99+
command: pip install virtualenv
100+
- run:
101+
name: Init virtualenv
102+
command: virtualenv env
103+
- run:
104+
name: install cloudify
105+
command: pip install cloudify==4.3.2
106+
- run:
107+
name: install test requirements
108+
command: pip install nose 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.0.zip
109+
- run:
110+
name: execute test
111+
command: nosetests -s tests/test_env.py:TestGCP
112+
113+
workflows:
114+
version: 2
115+
tests:
116+
jobs:
117+
- azure:
118+
context: ecosystem
119+
filters:
120+
branches:
121+
only: /([0-9\.]*\-build|latest|dev)/
122+
- aws:
123+
context: ecosystem
124+
filters:
125+
branches:
126+
only: /([0-9\.]*\-build|latest|dev)/
127+
- gcp:
128+
context: ecosystem
129+
filters:
130+
branches:
131+
only: /([0-9\.]*\-build|latest|dev)/

‎aws.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,9 @@ node_templates:
462462
- type: cloudify.relationships.depends_on
463463
target: nic
464464
- type: cloudify.relationships.depends_on
465-
target: centos_core_ami
465+
target: centos_core_ami
466+
- type: cloudify.relationships.depends_on
467+
target: nat_gateway
466468
interfaces:
467469
cloudify.interfaces.lifecycle:
468470
configure:

‎circle.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎scripts/manager/tasks.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ def install_rpm(_rpm):
1313
sudo("rpm -i {0}".format(_rpm))
1414
except Exception as e:
1515
raise NonRecoverableError(str(e))
16-
if not os.path.exists(CONFIG_PATH):
17-
raise RecoverableError('Failed to install RPM.')
1816
return True
1917

2018
def install_requirements():

‎tests/__init__.py‎

Whitespace-only changes.

0 commit comments

Comments
 (0)