diff options
| author | danielsdeleo <dan@opscode.com> | 2013-01-17 16:33:37 -0800 |
|---|---|---|
| committer | danielsdeleo <dan@opscode.com> | 2013-01-17 17:13:38 -0800 |
| commit | ffc93ff39aa340107e93b95d77fa3643b9384da3 (patch) | |
| tree | 88e8ab535025d1f183da3ff404706e799a2a904b /ci | |
| parent | 0fea607743afb8f84b12b49956ff99725ac4d263 (diff) | |
| download | chef-ffc93ff39aa340107e93b95d77fa3643b9384da3.tar.gz | |
rm accidentally merged 10.x ci script changes
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/jenkins_run_tests.bat | 3 | ||||
| -rwxr-xr-x | ci/jenkins_run_tests.sh | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat index b5c35a34cd..b5076949f3 100644 --- a/ci/jenkins_run_tests.bat +++ b/ci/jenkins_run_tests.bat @@ -5,8 +5,5 @@ call bundle install --binstubs --path vendor/bundle || ( call rm Gemfile.lock && ruby bin\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional spec/unit spec/stress set RSPEC_ERRORLVL=%ERRORLEVEL% -REM place rspec output back in jenkins working directory -move test.xml .. - 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 index be9c6a882e..90a1fec0c8 100755 --- a/ci/jenkins_run_tests.sh +++ b/ci/jenkins_run_tests.sh @@ -9,8 +9,5 @@ bundle install --path vendor/bundle || ( rm Gemfile.lock && bundle install --pat bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec; RSPEC_RETURNCODE=$? -# move the rspec results back into the jenkins working directory -mv test.xml .. - # exit with the result of running rspec exit $RSPEC_RETURNCODE |