summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-09-18 16:59:21 -0700
committerTim Smith <tsmith@chef.io>2017-10-20 12:51:55 -0700
commit567c8a5e98f84adf9f384fe0c5f7d3e1cda4322e (patch)
tree162c8b5c3d194750ced09958f75a10a9e0c7aeb6
parentd646ef03f32874a150a09603ca09ef59abcf13f6 (diff)
downloadchef-567c8a5e98f84adf9f384fe0c5f7d3e1cda4322e.tar.gz
Enable testing in Fedora
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.travis.yml111
1 files changed, 56 insertions, 55 deletions
diff --git a/.travis.yml b/.travis.yml
index c4562a808e..b8ef5d900d 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
@@ -253,43 +253,44 @@ matrix:
# env:
# - AMAZONLINUX=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 awesome-customers-ubuntu-ubuntu-1404
-# after_failure:
-# - cat .kitchen/logs/kitchen.log
-# env:
-# - AWESOME_CUSTOMERS_UBUNTU=1
-# - 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 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.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 awesome-customers-ubuntu-ubuntu-1404
+ after_failure:
+ - cat .kitchen/logs/kitchen.log
+ env:
+ - AWESOME_CUSTOMERS_UBUNTU=1
+ - 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 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.4.2
sudo: required
before_install: