Skip to content

Commit 027294c

Browse files
authored
Merge pull request #1205 from lionce/FM-7982
FM-7982 - update provisioner to docker_exp
2 parents 66d1711 + 3184d67 commit 027294c

File tree

2 files changed

+14
-38
lines changed

2 files changed

+14
-38
lines changed

.travis.yml

+9-36
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ matrix:
2525
rvm: 2.5.1
2626
before_script:
2727
- bundle exec rake 'litmus:provision_list[travis_deb]'
28-
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
2928
- bundle exec rake 'litmus:install_agent[puppet5]'
3029
- bundle exec rake litmus:install_module
3130
script:
@@ -39,7 +38,6 @@ matrix:
3938
rvm: 2.5.1
4039
before_script:
4140
- bundle exec rake 'litmus:provision_list[travis_deb]'
42-
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
4341
- bundle exec rake 'litmus:install_agent[puppet6]'
4442
- bundle exec rake litmus:install_module
4543
script:
@@ -75,55 +73,30 @@ matrix:
7573
-
7674
bundler_args:
7775
dist: trusty
78-
env: PLATFORM=centos6_puppet5
79-
rvm: 2.5.1
80-
before_script:
81-
- bundle exec rake 'litmus:provision[docker, waffleimage/centos6]'
82-
- bundle exec rake 'litmus:install_agent[puppet5]'
83-
- bundle exec rake litmus:install_module
84-
script:
85-
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
86-
services: docker
87-
sudo: required
88-
-
89-
bundler_args:
90-
dist: trusty
91-
env: PLATFORM=centos6_puppet6
92-
rvm: 2.5.1
93-
before_script:
94-
- bundle exec rake 'litmus:provision[docker, waffleimage/centos6]'
95-
- bundle exec rake 'litmus:install_agent[puppet6]'
96-
- bundle exec rake litmus:install_module
97-
script:
98-
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
99-
services: docker
100-
sudo: required
101-
-
102-
bundler_args:
103-
dist: trusty
104-
env: PLATFORM=scientificlinux6_puppet5
105-
rvm: 2.5.1
76+
env: PLATFORMS=el6_puppet5
77+
rvm: 2.5.3
10678
before_script:
107-
- bundle exec rake 'litmus:provision[docker, waffleimage/scientificlinux6]'
79+
- bundle exec rake 'litmus:provision_list[travis_el6]'
10880
- bundle exec rake 'litmus:install_agent[puppet5]'
10981
- bundle exec rake litmus:install_module
11082
script:
111-
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
83+
- bundle exec rake litmus:acceptance:parallel
11284
services: docker
11385
sudo: required
11486
-
11587
bundler_args:
11688
dist: trusty
117-
env: PLATFORM=scientificlinux6_puppet6
118-
rvm: 2.5.1
89+
env: PLATFORMS=el6_puppet6
90+
rvm: 2.5.3
11991
before_script:
120-
- bundle exec rake 'litmus:provision[docker, waffleimage/scientificlinux6]'
92+
- bundle exec rake 'litmus:provision_list[travis_el6]'
12193
- bundle exec rake 'litmus:install_agent[puppet6]'
12294
- bundle exec rake litmus:install_module
12395
script:
124-
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
96+
- bundle exec rake litmus:acceptance:parallel
12597
services: docker
12698
sudo: required
99+
127100
-
128101
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
129102
-

provision.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
---
22
default:
3-
provisioner: docker
3+
provisioner: docker_exp
44
images: ['waffleimage/centos7']
55
travis_deb:
66
provisioner: docker
77
images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
8+
travis_el6:
9+
provisioner: docker_exp
10+
images: ['waffleimage/centos6', 'waffleimage/scientificlinux6']
811
travis_el7:
9-
provisioner: docker
12+
provisioner: docker_exp
1013
images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
1114
release_checks:
1215
provisioner: vmpooler

0 commit comments

Comments
 (0)