summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-05-01 20:00:01 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2019-05-01 20:02:22 -0700
commitbc01e9a05accb6494c5efc42ec5d93f0b29a59ca (patch)
treeb630d79d65e2580aa72c83c43f64aa463324ce33
parentfc8bf894660855c428012b34cdae6679dffd4a0e (diff)
downloadchef-bc01e9a05accb6494c5efc42ec5d93f0b29a59ca.tar.gz
update the ci verify tasks for chef-15lcg/update-ci-verify
we need to bundle install now in both places (ChefDK style of appbundling means there is no Gemfile.lock here and we do the install against the somewhat novel-looking Gemfile that kinda looks like Gemfile.lock). and on windows side since there is no Gemfile.lock any more we need to avoid that test. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rwxr-xr-xci/verify-chef.bat15
-rwxr-xr-xci/verify-chef.sh1
2 files changed, 3 insertions, 13 deletions
diff --git a/ci/verify-chef.bat b/ci/verify-chef.bat
index d08b2c3c4e..37e5bcd323 100755
--- a/ci/verify-chef.bat
+++ b/ci/verify-chef.bat
@@ -68,13 +68,6 @@ cd %CHEFDIR%
cd
-type Gemfile.lock
-
-IF NOT EXIST "Gemfile.lock" (
- ECHO "Chef gem does not contain a Gemfile.lock! This is needed to run any tests."
- GOTO :error
-)
-
IF "%PIPELINE_NAME%" == "chef-fips" (
set CHEF_FIPS=1
)
@@ -82,12 +75,8 @@ 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
-REM ; we should use bundler, but aren't because of a bug
-REM ; this should be `bundle exec rspec yadda yadda...`
-REM ; the bug is here: https://github.com/bundler/bundler/issues/5644
-REM ; while this opens us up to some testing edge conditions if we're doing our job right to build the omnibus package and its gems correct that shouldn't matter
-REM ; since that assumption has gone wrong before we should really go back to using bundler at some point
-call %EMBEDDED_BIN_DIR%\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/functional
+call %EMBEDDED_BIN_DIR%\bundle install
+call %EMBEDDED_BIN_DIR%\bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/functional
GOTO :EOF
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh
index b6dafa33e4..105e8f267d 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -110,4 +110,5 @@ CHEF_GEM=`dirname $lib_dir`
cd $CHEF_GEM
+sudo bundle install
sudo bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional