summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-07-19 14:38:07 -0700
committerGitHub <noreply@github.com>2019-07-19 14:38:07 -0700
commita578026e19e7023d722bde47d7bbbea5e4fdd1a9 (patch)
tree30bcef7b70e58d51eee85e68957ba88c1f6b7b15
parentd6243f194796fc9a928ce80a1386fbd034fc390b (diff)
parent1ca928126ba5b7b558bdf1aca2a273b6d3e189e0 (diff)
downloadchef-a578026e19e7023d722bde47d7bbbea5e4fdd1a9.tar.gz
Merge pull request #8758 from chef/fedora_testing
Cleanup the Travis config
-rw-r--r--.travis.yml33
1 files changed, 12 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml
index 6904a1da75..2d711f7e10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,6 @@ before_install:
- rm -f .bundle/config
before_script:
- # force all .rspec tests into progress display to reduce line count
- - echo --color > .rspec
- - echo -fp >> .rspec
# necessary for sudo: true tests, ingore failures on tests invoked with sudo: false
- sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
@@ -34,7 +31,7 @@ env:
matrix:
include:
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -50,7 +47,7 @@ matrix:
env:
- AMAZON=2
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -66,7 +63,7 @@ matrix:
env:
- AMAZON=201X
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -82,7 +79,7 @@ matrix:
env:
- UBUNTU=16.04
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -98,7 +95,7 @@ matrix:
env:
- UBUNTU=18.04
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -114,7 +111,7 @@ matrix:
env:
- DEBIAN=8
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -130,7 +127,7 @@ matrix:
env:
- DEBIAN=9
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -146,7 +143,7 @@ matrix:
env:
- DEBIAN=10
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -162,7 +159,7 @@ matrix:
env:
- CENTOS=6
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -178,7 +175,7 @@ matrix:
env:
- CENTOS=7
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -194,7 +191,7 @@ matrix:
env:
- FEDORA=latest
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
services: docker
gemfile: kitchen-tests/Gemfile
before_install:
@@ -210,7 +207,7 @@ matrix:
env:
- OPENSUSELEAP=42
- KITCHEN_YAML=kitchen.yml
- - rvm: 2.5.5
+ - rvm: 2.6.3
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- rvm @global do gem uninstall bundler -a -x || true
@@ -228,9 +225,3 @@ matrix:
- cat /tmp/out.txt
- sudo cat /var/log/squid3/cache.log
- sudo cat /var/log/squid3/access.log
-
-notifications:
- on_change: true
- on_failure: true
- on_success: change
- on_pull_requests: false