@@ -23,10 +23,6 @@ executors:
2323 machine :
2424 image : ubuntu-1604:201903-01
2525
26- cloudify-machine :
27- machine :
28- image : ubuntu-1604:201903-01
29-
3026 cloudify-machine-510 :
3127 machine :
3228 image : ubuntu-1604:201903-01
@@ -72,17 +68,17 @@ commands:
7268 exit 1
7369 fi
7470
75- generate_py27py36_wagon :
71+ generate_py36_wagon :
7672 steps :
7773 - run :
7874 name : Create Workspace Build directory.
7975 command : mkdir -p workspace/build
8076 - run :
81- name : Build py27py36 Wagon
77+ name : Build py36 Wagon
8278 command : |
8379 git clone https://github.com/cloudify-cosmo/cloudify-wagon-build-containers.git
84- docker build -t cloudify-wagon-builder-centos-7-py2py3 cloudify-wagon-build-containers/centos_7_py2py3
85- docker run -v ~/project/:/packaging cloudify-wagon-builder-centos-7-py2py3
80+ docker build -t cloudify-wagon-builder-centos cloudify-wagon-build-containers/centos_7_py3
81+ docker run -v ~/project/:/packaging cloudify-wagon-builder-centos
8682 - run :
8783 name : copy wagon to workspace
8884 command : cp *.wgn workspace/build/
@@ -91,17 +87,17 @@ commands:
9187 paths :
9288 - build/*
9389
94- generate_rhel_py27py36_wagon :
90+ generate_rhel_py36_wagon :
9591 steps :
9692 - run :
9793 name : Create Workspace Build directory.
9894 command : mkdir -p workspace/build
9995 - run :
100- name : Build RHEL py27py36 Wagon
96+ name : Build RHEL py36 Wagon
10197 command : |
10298 git clone https://github.com/cloudify-cosmo/cloudify-wagon-build-containers.git
103- docker build -t cloudify-wagon-builder-redhat-7-py2py3 cloudify-wagon-build-containers/redhat_7_py2py3 --build-arg USERNAME="$USERNAME" --build-arg PASSWORD="$PASSWORD"
104- docker run -v ~/project/:/packaging cloudify-wagon-builder-redhat-7-py2py3
99+ docker build -t cloudify-wagon-builder-redhat cloudify-wagon-build-containers/redhat_7_py3 --build-arg USERNAME="$USERNAME" --build-arg PASSWORD="$PASSWORD"
100+ docker run -v ~/project/:/packaging cloudify-wagon-builder-redhat
105101 - run :
106102 name : copy wagon to workspace
107103 command : cp *.wgn workspace/build/
@@ -129,42 +125,6 @@ commands:
129125 paths :
130126 - build/*
131127
132- run_integration_tests_505 :
133- steps :
134- - run :
135- name : " Pull Submodules"
136- command : |
137- git submodule init
138- git submodule update --remote --recursive
139- - attach_workspace :
140- at : workspace
141- - run :
142- name : update pip
143- command : pip install -U pip
144- - run :
145- name : install cloudify
146- command : |
147- pip install -r test-requirements.txt
148- - run :
149- name : download manager docker image
150- command : wget http://repository.cloudifysource.org/cloudify/5.0.5/ga-release/cloudify-docker-manager-5.0.5.tar
151- - run :
152- name : load docker image
153- command : docker load -i cloudify-docker-manager-5.0.5.tar
154- - run :
155- name : retain space by dumping the tar
156- command : rm cloudify-docker-manager-5.0.5.tar
157- - run :
158- name : show images
159- command : docker images
160- - run :
161- name : start docker container
162- command : docker run --name cfy_manager -d --restart unless-stopped -v /sys/fs/cgroup:/sys/fs/cgroup:ro --tmpfs /run --tmpfs /run/lock --security-opt seccomp:unconfined --cap-add SYS_ADMIN --network host cloudifyplatform/premium-cloudify-manager-aio
163- - run :
164- name : install local project
165- command : pip install https://github.com/cloudify-incubator/cloudify-ecosystem-test/archive/latest.zip
166- - run : pytest -s .circleci/test_examples.py
167-
168128 run_integration_tests_510 :
169129 steps :
170130 - run :
@@ -375,23 +335,14 @@ jobs:
375335 executor : wagon_generator
376336 steps :
377337 - checkout
378- - generate_py27py36_wagon
338+ - generate_py36_wagon
379339
380340 rhel_wagon :
381341 executor : wagon_generator
382342 steps :
383343 - checkout
384- - generate_rhel_py27py36_wagon
344+ - generate_rhel_py36_wagon
385345
386- # integration_tests_505:
387- # executor: cloudify-machine
388- # environment:
389- # CLOUDIFY_SSL_TRUST_ALL: true
390- # IAAS: openstack
391- # TEST_NAME: cloudformation
392- # steps:
393- # - checkout
394- # - run_integration_tests_505
395346#
396347# integration_tests_510:
397348# executor: cloudify-machine-510
@@ -483,13 +434,6 @@ workflows:
483434 filters :
484435 branches :
485436 only : /([0-9\.]*\-build|master|dev)/
486- # - integration_tests_505:
487- # requires:
488- # - wagon
489- # - rhel_wagon
490- # filters:
491- # branches:
492- # only: /([0-9\.]*\-build|master|dev)/
493437# - integration_tests_510:
494438# requires:
495439# - wagon
0 commit comments