summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-11-14 10:48:54 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2014-11-14 10:48:54 -0800
commit70e7e2a56d8b6db36de331df53e9be46252b9fc3 (patch)
treea1a21e3b42b93e5cf397061f707a61de26371bb4 /.travis.yml
parent4be0cce9900dbfb37487b05171b7137331664e1b (diff)
downloadchef-70e7e2a56d8b6db36de331df53e9be46252b9fc3.tar.gz
skip expensive spec tests by default
- `rake spec` skips knife integration tests - `rake spec:all` includes them - PRs only get `rake spec` - master (and 10/11/12-stable) get `rake spec:all` - rspec and rspec spec are still essentially rake spec:all (so omnibus-chef still tests every spec) - also some cleanup of the rspec jobs
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 7e539fd70f..b2b002d8b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,15 @@ branches:
- 11-stable
- 12-stable
-script: bundle exec rspec --color --format progress
+# do not run expensive spec tests on PRs, only on branches
+script: "
+echo '--color\n-fp' > .rspec;
+if [ ${TRAVIS_PULL_REQUEST} = 'false' ];
+then
+ bundle exec rake spec:all;
+else
+ bundle exec rake spec;
+fi"
env:
global: