diff options
author | Seth Chisamore <schisamo@chef.io> | 2016-01-08 18:28:18 -0800 |
---|---|---|
committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-11 16:10:38 -0500 |
commit | 602c9fb3d94b76057c58e2a73174789d39495661 (patch) | |
tree | 913af53a8ad79ab1ff6dd47e2920a1d8f118c5dd | |
parent | 61bd67e56e7917306eedfe13ef8dc7532671c785 (diff) | |
download | chef-602c9fb3d94b76057c58e2a73174789d39495661.tar.gz |
Move Jenkins verification scripts to top-level
-rw-r--r-- | ci/jenkins_run_tests.bat | 14 | ||||
-rwxr-xr-x | ci/jenkins_run_tests.sh | 13 | ||||
-rwxr-xr-x | ci/verify-chef.bat (renamed from omnibus/jenkins/verify-chef.bat) | 0 | ||||
-rwxr-xr-x | ci/verify-chef.sh (renamed from omnibus/jenkins/verify-chef.sh) | 0 |
4 files changed, 0 insertions, 27 deletions
diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat deleted file mode 100644 index ba9cedd5e2..0000000000 --- a/ci/jenkins_run_tests.bat +++ /dev/null @@ -1,14 +0,0 @@ -ruby -v - -call bundle check - -if %ERRORLEVEL% NEQ 0 ( - call rm Gemfile.lock - call bundle install --without docgen --path vendor/bundle -) - -bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional spec/unit spec/stress spec/integration - -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 5bf7def062..0000000000 --- a/ci/jenkins_run_tests.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/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 --without docgen --path vendor/bundle || ( rm Gemfile.lock && bundle install --path vendor/bundle ) -bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec; -RSPEC_RETURNCODE=$? - -# exit with the result of running rspec -exit $RSPEC_RETURNCODE diff --git a/omnibus/jenkins/verify-chef.bat b/ci/verify-chef.bat index 1c159f0668..1c159f0668 100755 --- a/omnibus/jenkins/verify-chef.bat +++ b/ci/verify-chef.bat diff --git a/omnibus/jenkins/verify-chef.sh b/ci/verify-chef.sh index 4e60b1fd9f..4e60b1fd9f 100755 --- a/omnibus/jenkins/verify-chef.sh +++ b/ci/verify-chef.sh |