From e54c79b68bb5e9c768675cc0094ea4f83a8da06f Mon Sep 17 00:00:00 2001 From: danielsdeleo Date: Thu, 15 Nov 2012 14:47:42 -0800 Subject: try running functional tests first ...should help avoid pollution of global state from unit tests --- ci/jenkins_run_tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat index 445798090c..9bcec5c445 100644 --- a/ci/jenkins_run_tests.bat +++ b/ci/jenkins_run_tests.bat @@ -5,4 +5,4 @@ cd chef ruby -v call bundle install --binstubs --path vendor/bundle || ( call rm Gemfile.lock && call bundle install --binstubs --path vendor/bundle ) -ruby bin\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/unit spec/functional +ruby bin\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional spec/unit -- cgit v1.2.1 From 19d5a2ffd6d42a0f226555ea2cdeae79c6b42c0c Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Wed, 28 Nov 2012 10:15:48 -0800 Subject: move test.xml ci output file back up to workspace directory --- ci/jenkins_run_tests.bat | 1 + ci/jenkins_run_tests.sh | 1 + 2 files changed, 2 insertions(+) (limited to 'ci') diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat index 9bcec5c445..5cb2923a4a 100644 --- a/ci/jenkins_run_tests.bat +++ b/ci/jenkins_run_tests.bat @@ -6,3 +6,4 @@ cd chef ruby -v call bundle install --binstubs --path vendor/bundle || ( call rm Gemfile.lock && call bundle install --binstubs --path vendor/bundle ) ruby bin\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional spec/unit +move test.xml .. diff --git a/ci/jenkins_run_tests.sh b/ci/jenkins_run_tests.sh index 5e5078042d..8139d24d8c 100755 --- a/ci/jenkins_run_tests.sh +++ b/ci/jenkins_run_tests.sh @@ -10,3 +10,4 @@ ruby -v; # This should take care of Gemfile changes that result in "bad" bundles without forcing us to rebundle every time bundle install --binstubs --path vendor/bundle || ( rm Gemfile.lock && bundle install --binstubs --path vendor/bundle ) bin/rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec; +mv test.xml .. -- cgit v1.2.1 From 0cb93634fa7f2b36e81d4d438ec19bd2a1277946 Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Thu, 29 Nov 2012 16:00:48 -0500 Subject: Add stress tests to jenkins on windows --- ci/jenkins_run_tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat index 5cb2923a4a..f2ac0d18dd 100644 --- a/ci/jenkins_run_tests.bat +++ b/ci/jenkins_run_tests.bat @@ -5,5 +5,5 @@ cd chef ruby -v call bundle install --binstubs --path vendor/bundle || ( call rm Gemfile.lock && call bundle install --binstubs --path vendor/bundle ) -ruby bin\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional spec/unit +ruby bin\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional spec/unit spec/stress move test.xml .. -- cgit v1.2.1 From 72aee57b0360773d846c4e8e55d5c6129b70a374 Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Thu, 29 Nov 2012 17:04:35 -0500 Subject: Preserve return code from running rspec --- ci/jenkins_run_tests.bat | 6 ++++++ ci/jenkins_run_tests.sh | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'ci') diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat index f2ac0d18dd..a1ed4858c8 100644 --- a/ci/jenkins_run_tests.bat +++ b/ci/jenkins_run_tests.bat @@ -6,4 +6,10 @@ cd chef ruby -v call bundle install --binstubs --path vendor/bundle || ( call rm Gemfile.lock && call bundle install --binstubs --path vendor/bundle ) 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 8139d24d8c..293ec84da5 100755 --- a/ci/jenkins_run_tests.sh +++ b/ci/jenkins_run_tests.sh @@ -10,4 +10,10 @@ ruby -v; # This should take care of Gemfile changes that result in "bad" bundles without forcing us to rebundle every time bundle install --binstubs --path vendor/bundle || ( rm Gemfile.lock && bundle install --binstubs --path vendor/bundle ) bin/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 +return $RSPEC_RETURNCODE -- cgit v1.2.1 From 81a724430f4cee4c35fb4d1671729eb258265f40 Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Thu, 29 Nov 2012 14:25:33 -0800 Subject: exit from shell jenkins shell script too much windows in that moment there; need to exit and not return --- ci/jenkins_run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/jenkins_run_tests.sh b/ci/jenkins_run_tests.sh index 293ec84da5..5c0ab55000 100755 --- a/ci/jenkins_run_tests.sh +++ b/ci/jenkins_run_tests.sh @@ -16,4 +16,4 @@ RSPEC_RETURNCODE=$? mv test.xml .. # exit with the result of running rspec -return $RSPEC_RETURNCODE +exit $RSPEC_RETURNCODE -- cgit v1.2.1