summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorsdelano <stephen@opscode.com>2013-02-06 17:05:43 -0800
committersdelano <stephen@opscode.com>2013-02-06 17:05:43 -0800
commitb4cd97769913d6dc84b09519d5fe74b8fa96d743 (patch)
tree251882520071463c51a363d21390d20d55181cfa /ci
parent2f81aaa2f2e6b016747a6687f874e2d830860e9f (diff)
downloadchef-b4cd97769913d6dc84b09519d5fe74b8fa96d743.tar.gz
[CHEF-3840] ci: don't install document generation gems
Diffstat (limited to 'ci')
-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 b5076949f3..4d1b1d1477 100644
--- a/ci/jenkins_run_tests.bat
+++ b/ci/jenkins_run_tests.bat
@@ -1,7 +1,7 @@
set PATH=C:\Ruby192\bin;%PATH%
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 90a1fec0c8..9330d7cd07 100755
--- a/ci/jenkins_run_tests.sh
+++ b/ci/jenkins_run_tests.sh
@@ -5,7 +5,7 @@ export PATH=/usr/local/bin:$PATH
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 --path vendor/bundle || ( rm Gemfile.lock && bundle install --path vendor/bundle )
+bundle install --without docgen --path vendor/bundle || ( rm Gemfile.lock && bundle install --path vendor/bundle )
bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec;
RSPEC_RETURNCODE=$?