summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-18 07:53:17 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-18 14:21:02 -0700
commit82dce820b33c1ba4839aebdb43d52d6a49d3b3b1 (patch)
tree4b9a31b3b40a66afcecab4c81d0829fecc594630 /ci
parenta80c5cf9e7b373b7f41868f476ef2f689b3a0fbc (diff)
downloadchef-82dce820b33c1ba4839aebdb43d52d6a49d3b3b1.tar.gz
Install only core chef plus test when testing
Diffstat (limited to 'ci')
-rwxr-xr-xci/verify-chef.bat3
-rwxr-xr-xci/verify-chef.sh4
2 files changed, 2 insertions, 5 deletions
diff --git a/ci/verify-chef.bat b/ci/verify-chef.bat
index a063cd417e..5ea317d82c 100755
--- a/ci/verify-chef.bat
+++ b/ci/verify-chef.bat
@@ -63,6 +63,5 @@ set FORCE_FFI_YAJL=ext
set BUNDLE_IGNORE_CONFIG=true
set BUNDLE_FROZEN=1
-set BUNDLE_WITHOUT=docgen:maintenance:omnibus_package:integration:aix:bsd:linux:mac_os_x:solaris
-call bundle install
+set BUNDLE_WITHOUT=development:guard:maintenance:tools:integration:changelog:compat_testing:docgen:travis:aix:bsd:linux:mac_os_x:solaris
call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/functional
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh
index 47f9faa31c..9574e8c1de 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -123,7 +123,5 @@ else
export CHEF_FIPS
fi
- # TODO Fix Solaris and AIX so we don't have to do GIT_SSL_NO_VERIFY=true
- # sudo env BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 BUNDLE_WITHOUT=docgen:maintenance:omnibus_package:integration GIT_SSL_NO_VERIFY=true PATH=$PATH TERM=xterm CHEF_FIPS=$CHEF_FIPS bundle install
- sudo env BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 BUNDLE_WITHOUT=docgen:maintenance:omnibus_package:integration GIT_SSL_NO_VERIFY=true PATH=$PATH TERM=xterm CHEF_FIPS=$CHEF_FIPS bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional
+ sudo env BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 BUNDLE_WITHOUT=development:guard:maintenance:tools:integration:changelog:compat_testing:docgen:travis GIT_SSL_NO_VERIFY=true PATH=$PATH TERM=xterm CHEF_FIPS=$CHEF_FIPS bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional
fi