[ARVADOS-DEV] updated: d7e56bd7e8744b54af33675cb875859ca9d053ea
git at public.curoverse.com
git at public.curoverse.com
Thu Aug 21 10:21:42 EDT 2014
Summary of changes:
jenkins/run-tests.sh | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
via d7e56bd7e8744b54af33675cb875859ca9d053ea (commit)
from 327681d1eee19c941e33beaef75359ea72b0c2f9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit d7e56bd7e8744b54af33675cb875859ca9d053ea
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Aug 21 10:21:39 2014 -0400
Permit setting environment variables on command line. Added workbench_test,
apiserver_test and cli_test variables to provide parameters to the respective
rake tests. no issue #
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 2e93e3d..c7531e2 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -5,14 +5,20 @@
# Exit non-zero if any tests fail.
#
# Arguments:
-# --skip FOO Do not test the FOO component.
-# --only FOO Do not test anything except the FOO component.
+# --skip FOO Do not test the FOO component.
+# --only FOO Do not test anything except the FOO component.
+# envvar=value Set $envvar to value
#
# Regardless of which components are tested, install all components in
# the usual sequence. (Many test suites depend on other components
# being installed.)
#
+# Useful environment variables include $workbench_test, $apiserver_test and
+# $cli_test. To run a specific test, use a command line such as:
#
+# $ ./run-tests.sh --only workbench workbench_test=TEST=test/integration/pipeline_instances_test.rb
+
+
# First make sure to remove any ARVADOS_ variables from the calling environment
# that could interfer with the tests.
unset $(env | cut -d= -f1 | grep \^ARVADOS_)
@@ -59,6 +65,9 @@ do
--only)
only="$1"; shift
;;
+ *=*)
+ eval $arg
+ ;;
*)
echo >&2 "$0: Unrecognized option: '$arg'"
exit 1
@@ -188,7 +197,7 @@ do_install apiserver
test_apiserver() {
cd "$WORKSPACE/services/api"
- bundle exec rake test
+ bundle exec rake test "$apiserver_test"
}
do_test apiserver
@@ -264,7 +273,7 @@ done
test_workbench() {
cd "$WORKSPACE/apps/workbench" \
&& bundle install --deployment \
- && bundle exec rake test
+ && bundle exec rake test "$workbench_test"
}
do_test workbench
@@ -273,7 +282,7 @@ test_cli() {
cd "$WORKSPACE/sdk/cli" \
&& bundle install --deployment \
&& mkdir -p /tmp/keep \
- && KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test
+ && KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test "$cli_test"
}
do_test cli
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list