diff options
| author | Tim Smith <tsmith84@gmail.com> | 2019-12-30 14:13:10 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2019-12-30 14:13:10 -0800 |
| commit | 2d700a69bebadcc6ebc8cc024c60621763629d62 (patch) | |
| tree | 8b055f96b538e17518f18e89bbaa2168bdd56bd7 | |
| parent | b62033885925961d1049e6823eecaa2cb599a1cc (diff) | |
| download | ohai-2d700a69bebadcc6ebc8cc024c60621763629d62.tar.gz | |
Test on Ruby 2.7 final docker container and remove old Jenkins files
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 4 | ||||
| -rw-r--r-- | ci/jenkins_run_tests.bat | 16 | ||||
| -rwxr-xr-x | ci/jenkins_run_tests.sh | 17 |
3 files changed, 2 insertions, 35 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 2496cf8f..58152911 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -40,13 +40,13 @@ steps: docker: image: ruby:2.6-buster -- label: run-specs-ruby-2.7-rc +- label: run-specs-ruby-2.7 command: - .expeditor/run_linux_tests.sh rspec expeditor: executor: docker: - image: ruby:2.7-rc-buster + image: ruby:2.7-buster - label: run-specs-windows command: diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat deleted file mode 100644 index 48336da7..00000000 --- a/ci/jenkins_run_tests.bat +++ /dev/null @@ -1,16 +0,0 @@ -ruby -v - -call bundle check - -if %ERRORLEVEL% NEQ 0 ( - call rm Gemfile.lock - call bundle install --without docgen -) - -bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec - -set RSPEC_ERRORLVL=%ERRORLEVEL% - -set RSPEC_ERRORLVL=%ERRORLEVEL% -REM Return the error level from rspec -exit /B %RSPEC_ERRORLVL% diff --git a/ci/jenkins_run_tests.sh b/ci/jenkins_run_tests.sh deleted file mode 100755 index 78e8c7a4..00000000 --- a/ci/jenkins_run_tests.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -export PATH=$PATH:/usr/local/bin - -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 --without docgen --path vendor/bundle || ( rm Gemfile.lock && bundle install --path vendor/bundle ) -# preserve the environment and $PATH of the `jenkins` user -sudo -E bash -c "export PATH=$PATH && bin/rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec" -# Ensure Jenkins can clean this file up -sudo chown ${USER-`whoami`} test.xml - -RSPEC_RETURNCODE=$? - -# exit with the result of running rspec -exit $RSPEC_RETURNCODE |