diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-05-02 10:44:09 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-05-02 10:44:09 -0700 |
| commit | 6ebcf641f8be95ac4784359e086bc19cebca78da (patch) | |
| tree | 87b9f013cb2774a0397f8d4775ba6a54cc79cf9d | |
| parent | dc4dfe711a16c29e1c9f70a5edbcab850f4bf4f4 (diff) | |
| download | chef-6ebcf641f8be95ac4784359e086bc19cebca78da.tar.gz | |
completely deprecate run_chef_tests
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rwxr-xr-x | tasks/bin/run_chef_tests | 6 |
2 files changed, 8 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index f045a0c0a7..103b0ec68b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,17 +30,22 @@ matrix: include: - rvm: 2.1 sudo: true - script: tasks/bin/run_chef_tests + script: sudo -E $(which bundle) exec rake spec; # also remove integration / external tests bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - rvm: 2.2 sudo: true - script: tasks/bin/run_chef_tests + script: sudo -E $(which bundle) exec rake spec; # also remove integration / external tests bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - rvm: 2.3.0 sudo: true - script: tasks/bin/run_chef_tests + script: sudo -E $(which bundle) exec rake spec; + # also remove integration / external tests + bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen + - rvm: rbx + sudo: true + script: sudo -E $(which bundle) exec rake spec; # also remove integration / external tests bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - env: @@ -55,11 +60,6 @@ matrix: script: bundle exec bundle-audit check --update # also remove integration / external tests bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - - rvm: rbx - sudo: true - script: tasks/bin/run_chef_tests - # also remove integration / external tests - bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen # # External tests # diff --git a/tasks/bin/run_chef_tests b/tasks/bin/run_chef_tests deleted file mode 100755 index 363086e688..0000000000 --- a/tasks/bin/run_chef_tests +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# Fail fast (e) and echo commands (vx) -set -evx - -sudo -E $(which bundle) exec rake spec; |