Skip to content

Commit fa59c3c

Browse files
committed
update provisioner to docker_exp
added oraclelinux6 to provision.yaml
1 parent 66d1711 commit fa59c3c

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

.travis.yml

+21-19
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,59 @@ matrix:
7573
-
7674
bundler_args:
7775
dist: trusty
78-
env: PLATFORM=centos6_puppet5
79-
rvm: 2.5.1
76+
env: PLATFORMS=el6_puppet5
77+
rvm: 2.5.3
8078
before_script:
81-
- bundle exec rake 'litmus:provision[docker, waffleimage/centos6]'
79+
- bundle exec rake 'litmus:provision_list[travis_el6]'
8280
- bundle exec rake 'litmus:install_agent[puppet5]'
8381
- bundle exec rake litmus:install_module
8482
script:
85-
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
83+
- bundle exec rake litmus:acceptance:parallel
8684
services: docker
8785
sudo: required
8886
-
8987
bundler_args:
9088
dist: trusty
91-
env: PLATFORM=centos6_puppet6
92-
rvm: 2.5.1
89+
env: PLATFORMS=el6_puppet6
90+
rvm: 2.5.3
9391
before_script:
94-
- bundle exec rake 'litmus:provision[docker, waffleimage/centos6]'
92+
- bundle exec rake 'litmus:provision_list[travis_el6]'
9593
- bundle exec rake 'litmus:install_agent[puppet6]'
9694
- bundle exec rake litmus:install_module
9795
script:
98-
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
96+
- bundle exec rake litmus:acceptance:parallel
9997
services: docker
10098
sudo: required
99+
101100
-
102101
bundler_args:
103102
dist: trusty
104-
env: PLATFORM=scientificlinux6_puppet5
103+
env: PLATFORM=deb_puppet6
105104
rvm: 2.5.1
106105
before_script:
107-
- bundle exec rake 'litmus:provision[docker, waffleimage/scientificlinux6]'
108-
- bundle exec rake 'litmus:install_agent[puppet5]'
106+
- bundle exec rake 'litmus:provision[docker, waffleimage/oraclelinux6]'
107+
- bundle exec rake 'litmus:install_agent[puppet6]'
109108
- bundle exec rake litmus:install_module
110109
script:
111-
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
110+
- bundle exec rake litmus:acceptance:parallel
112111
services: docker
113112
sudo: required
114-
-
113+
114+
-
115115
bundler_args:
116116
dist: trusty
117-
env: PLATFORM=scientificlinux6_puppet6
117+
env: PLATFORM=deb_puppet6
118118
rvm: 2.5.1
119119
before_script:
120-
- bundle exec rake 'litmus:provision[docker, waffleimage/scientificlinux6]'
121-
- bundle exec rake 'litmus:install_agent[puppet6]'
120+
- bundle exec rake 'litmus:provision[docker, waffleimage/oraclelinux6]'
121+
- bundle exec rake 'litmus:install_agent[puppet5]'
122122
- bundle exec rake litmus:install_module
123123
script:
124-
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
124+
- bundle exec rake litmus:acceptance:parallel
125125
services: docker
126126
sudo: required
127+
128+
127129
-
128130
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
129131
-

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)