summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-18 09:53:42 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-18 14:21:02 -0700
commit4225c2b182d093e38347b2a37834336ce09c3e39 (patch)
treeeb567eba630e9695af106d5ccd21bdb3bf5e1362 /ci
parentd43cdf151a20924d4157f67759072799ac79cbb1 (diff)
downloadchef-4225c2b182d093e38347b2a37834336ce09c3e39.tar.gz
Just use the actual installed bundle instead of reusing the Gemfile to run Chef tess
Diffstat (limited to 'ci')
-rwxr-xr-xci/verify-chef.bat2
-rwxr-xr-xci/verify-chef.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/verify-chef.bat b/ci/verify-chef.bat
index 5ea317d82c..7ba0817938 100755
--- a/ci/verify-chef.bat
+++ b/ci/verify-chef.bat
@@ -61,7 +61,7 @@ IF "%PIPELINE_NAME%" == "chef-fips" (
REM ; ffi-yajl must run in c-extension mode for perf, so force it so we don't accidentally fall back to ffi
set FORCE_FFI_YAJL=ext
+set BUNDLE_GEMFILE=C:\opscode\%PROJECT_NAME%\Gemfile
set BUNDLE_IGNORE_CONFIG=true
set BUNDLE_FROZEN=1
-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 70b62d06da..8118d2da33 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -125,5 +125,5 @@ else
export CHEF_FIPS
fi
- 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
+ sudo env BUNDLE_GEMFILE=/opt/$PROJECT_NAME/Gemfile BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 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