diff options
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 2 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.yml | 2 |
3 files changed, 4 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 6b4fea8ae7..db32d76324 100644 --- a/.travis.yml +++ b/.travis.yml @@ -271,24 +271,6 @@ matrix: env: - LEARNCHEF_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 learnchef-centos-7 - after_failure: - - cat .kitchen/logs/kitchen.log - env: - - LEARNCHEF_RHEL=1 - - KITCHEN_YAML=.kitchen.travis.yml # ### END TEST KITCHEN ONLY ### - rvm: 2.4.2 diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index 07115dc237..174d828b85 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -115,3 +115,5 @@ suites: run_list: - recipe[lamp::default] data_bags_path: data_bags + includes: + - ubuntu-14.04 diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml index f40f933a83..0cc5838a8f 100644 --- a/kitchen-tests/.kitchen.yml +++ b/kitchen-tests/.kitchen.yml @@ -34,3 +34,5 @@ suites: run_list: - recipe[lamp::default] data_bags_path: data_bags + includes: + - ubuntu-14.04 |