Skip to content

Commit

Permalink
update provisioner to docker_exp
Browse files Browse the repository at this point in the history
added oraclelinux6 to provision.yaml
  • Loading branch information
lionce committed Jun 12, 2019
1 parent 66d1711 commit 3184d67
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 38 deletions.
45 changes: 9 additions & 36 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ matrix:
rvm: 2.5.1
before_script:
- bundle exec rake 'litmus:provision_list[travis_deb]'
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
Expand All @@ -39,7 +38,6 @@ matrix:
rvm: 2.5.1
before_script:
- bundle exec rake 'litmus:provision_list[travis_deb]'
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
Expand Down Expand Up @@ -75,55 +73,30 @@ matrix:
-
bundler_args:
dist: trusty
env: PLATFORM=centos6_puppet5
rvm: 2.5.1
before_script:
- bundle exec rake 'litmus:provision[docker, waffleimage/centos6]'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
services: docker
sudo: required
-
bundler_args:
dist: trusty
env: PLATFORM=centos6_puppet6
rvm: 2.5.1
before_script:
- bundle exec rake 'litmus:provision[docker, waffleimage/centos6]'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
services: docker
sudo: required
-
bundler_args:
dist: trusty
env: PLATFORM=scientificlinux6_puppet5
rvm: 2.5.1
env: PLATFORMS=el6_puppet5
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision[docker, waffleimage/scientificlinux6]'
- bundle exec rake 'litmus:provision_list[travis_el6]'
- bundle exec rake 'litmus:install_agent[puppet5]'
- bundle exec rake litmus:install_module
script:
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required
-
bundler_args:
dist: trusty
env: PLATFORM=scientificlinux6_puppet6
rvm: 2.5.1
env: PLATFORMS=el6_puppet6
rvm: 2.5.3
before_script:
- bundle exec rake 'litmus:provision[docker, waffleimage/scientificlinux6]'
- bundle exec rake 'litmus:provision_list[travis_el6]'
- bundle exec rake 'litmus:install_agent[puppet6]'
- bundle exec rake litmus:install_module
script:
- TARGET_HOST=localhost:2222 bundle exec rspec ./spec/acceptance/
- bundle exec rake litmus:acceptance:parallel
services: docker
sudo: required

-
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
-
Expand Down
7 changes: 5 additions & 2 deletions provision.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
---
default:
provisioner: docker
provisioner: docker_exp
images: ['waffleimage/centos7']
travis_deb:
provisioner: docker
images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
travis_el6:
provisioner: docker_exp
images: ['waffleimage/centos6', 'waffleimage/scientificlinux6']
travis_el7:
provisioner: docker
provisioner: docker_exp
images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
release_checks:
provisioner: vmpooler
Expand Down

0 comments on commit 3184d67

Please sign in to comment.