diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-17 12:33:28 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-17 12:35:58 -0700 |
commit | ddb93d1d20205565fd7092e2fdeca3efddb00698 (patch) | |
tree | 36d5ed77cb294ed204d3711b920c1e4c038aaef5 /.travis.yml | |
parent | a1f9544e2ad149febbdd3e9acaacfec0323c20dd (diff) | |
download | chef-ddb93d1d20205565fd7092e2fdeca3efddb00698.tar.gz |
Chef-13: remove Chef::Platform.set and related methods
Switch over the Chef-12.0 ProviderResolver is now completed.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/.travis.yml b/.travis.yml index 336e1a20a5..1462a68e4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -272,43 +272,43 @@ matrix: # env: # - AMAZONLINUX=LATEST # - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.3 - services: docker - sudo: required - gemfile: kitchen-tests/Gemfile - before_install: - - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) - - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) - bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - before_script: - - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - - cd kitchen-tests - script: - - bundle exec kitchen test awesome-customers-ubuntu-ubuntu-1404 - after_failure: - - cat .kitchen/logs/kitchen.log - env: - - AWESOME_CUSTOMERS_UBUNTU=1 - - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.3 - services: docker - sudo: required - gemfile: kitchen-tests/Gemfile - before_install: - - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) - - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) - bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - before_script: - - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - - cd kitchen-tests - script: - - bundle exec kitchen test awesome-customers-rhel-centos-7 - after_failure: - - cat .kitchen/logs/kitchen.log - env: - - AWESOME_CUSTOMERS_RHEL=1 - - KITCHEN_YAML=.kitchen.travis.yml - ### END TEST KITCHEN ONLY ### +# - rvm: 2.3.3 +# services: docker +# sudo: required +# gemfile: kitchen-tests/Gemfile +# before_install: +# - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) +# - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) +# bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen +# before_script: +# - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) +# - cd kitchen-tests +# script: +# - bundle exec kitchen test awesome-customers-ubuntu-ubuntu-1404 +# after_failure: +# - cat .kitchen/logs/kitchen.log +# env: +# - AWESOME_CUSTOMERS_UBUNTU=1 +# - KITCHEN_YAML=.kitchen.travis.yml +# - rvm: 2.3.3 +# services: docker +# sudo: required +# gemfile: kitchen-tests/Gemfile +# before_install: +# - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) +# - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) +# bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen +# before_script: +# - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) +# - cd kitchen-tests +# script: +# - bundle exec kitchen test awesome-customers-rhel-centos-7 +# after_failure: +# - cat .kitchen/logs/kitchen.log +# env: +# - AWESOME_CUSTOMERS_RHEL=1 +# - KITCHEN_YAML=.kitchen.travis.yml +# ### END TEST KITCHEN ONLY ### - rvm: 2.3.3 sudo: required dist: trusty |