summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2013-02-06 21:09:53 -0800
committerBryan McLellan <btm@opscode.com>2013-02-06 21:09:53 -0800
commite30037e4a616158c2bc918e8ca8441fbba4e5589 (patch)
treef4043da77b970ccf3d0e9aca22387e2a1f055bd5
parentfbfa74331e05a25913b901aeea84e31b1747c2e2 (diff)
downloadchef-e30037e4a616158c2bc918e8ca8441fbba4e5589.tar.gz
exclude docgen from regular ci passes
-rw-r--r--ci/jenkins_run_tests.bat2
-rwxr-xr-xci/jenkins_run_tests.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat
index a1ed4858c8..f52dbb50cd 100644
--- a/ci/jenkins_run_tests.bat
+++ b/ci/jenkins_run_tests.bat
@@ -4,7 +4,7 @@ REM Chef 10 contains the client in the chef/ sub-directory
cd chef
ruby -v
-call bundle install --binstubs --path vendor/bundle || ( call rm Gemfile.lock && call bundle install --binstubs --path vendor/bundle )
+call bundle install --binstubs --without docgen --path vendor/bundle || ( call rm Gemfile.lock && call bundle install --binstubs --path vendor/bundle )
ruby bin\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional spec/unit spec/stress
set RSPEC_ERRORLVL=%ERRORLEVEL%
diff --git a/ci/jenkins_run_tests.sh b/ci/jenkins_run_tests.sh
index 5c0ab55000..d5275f564a 100755
--- a/ci/jenkins_run_tests.sh
+++ b/ci/jenkins_run_tests.sh
@@ -8,7 +8,7 @@ cd chef
ruby -v;
# remove the Gemfile.lock and try again if bundler fails.
# This should take care of Gemfile changes that result in "bad" bundles without forcing us to rebundle every time
-bundle install --binstubs --path vendor/bundle || ( rm Gemfile.lock && bundle install --binstubs --path vendor/bundle )
+bundle install --binstubs --without docgen --path vendor/bundle || ( rm Gemfile.lock && bundle install --binstubs --path vendor/bundle )
bin/rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec;
RSPEC_RETURNCODE=$?