summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-10-25 09:34:53 -0700
committerTim Smith <tsmith@chef.io>2017-11-28 14:53:18 -0800
commit03336b2e0a62a81184153c93417ebdb23ee0a595 (patch)
tree1298865f79836f368eb2f60f9337e8c3006299da /.travis.yml
parentb9b6128e849e81c9ebe550a7f7e130e8efd18104 (diff)
downloadchef-03336b2e0a62a81184153c93417ebdb23ee0a595.tar.gz
Turn back on Fedora testing in Travis
Use the new openssh cookbook which has a Fedora fix Turn off use_privilege_separation which doesn't work on Fedora Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml36
1 files changed, 18 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml
index 8e52f38611..80effc9fcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -217,24 +217,24 @@ matrix:
env:
- CENTOS=7
- KITCHEN_YAML=.kitchen.travis.yml
-# - rvm: 2.4.2
-# 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 docgen guard integration maintenance omnibus_package --frozen
-# before_script:
-# - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-# - cd kitchen-tests
-# script:
-# - bundle exec kitchen test base-fedora-latest
-# after_failure:
-# - cat .kitchen/logs/kitchen.log
-# env:
-# - FEDORA=latest
-# - KITCHEN_YAML=.kitchen.travis.yml
+ - rvm: 2.4.2
+ 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 docgen guard integration maintenance omnibus_package --frozen
+ before_script:
+ - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+ - cd kitchen-tests
+ script:
+ - bundle exec kitchen test base-fedora-latest
+ after_failure:
+ - cat .kitchen/logs/kitchen.log
+ env:
+ - FEDORA=latest
+ - KITCHEN_YAML=.kitchen.travis.yml
# - rvm: 2.4.2
# services: docker
# sudo: required