[ARVADOS-DEV] updated: 0f9882d559fc996a260fb6e00254fd9d5f7de218
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 19 16:49:02 EDT 2014
Summary of changes:
jenkins/run-tests.sh | 96 +++++++++++++++++++++++++++-------------------------
1 file changed, 49 insertions(+), 47 deletions(-)
via 0f9882d559fc996a260fb6e00254fd9d5f7de218 (commit)
via 254c4352cf3f0fba7861bd51b42498e996036227 (commit)
via cf97dfcc0a04149057688f302252d696c2d575fa (commit)
via 12a671a65b2cc1ec7431f8cd8b024cf70f269f7a (commit)
from 8c67902ccd67de79c0c86c85116c46b5dcfd82bb (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 0f9882d559fc996a260fb6e00254fd9d5f7de218
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 19 10:57:20 2014 -0400
3894: Fix sequence: do all installs, then all tests.
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 44bb603..9fe3218 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -214,7 +214,7 @@ title () {
printf "\n%*s%s\n\n" $((($COLUMNS-${#txt})/2)) "" "$txt"
}
-test_docs() {
+install_docs() {
cd "$WORKSPACE/doc"
bundle install --no-deployment
rm -rf .site
@@ -223,20 +223,7 @@ test_docs() {
PYTHONPATH=$WORKSPACE/sdk/python/ bundle exec rake generate baseurl=file://$WORKSPACE/doc/.site/ arvados_workbench_host=workbench.$ARVADOS_API_HOST arvados_api_host=$ARVADOS_API_HOST
unset ARVADOS_API_HOST
}
-do_test docs
-
-test_doclinkchecker() {
- cd "$WORKSPACE/doc"
- bundle exec rake linkchecker baseurl=file://$WORKSPACE/doc/.site/
-}
-do_test doclinkchecker
-
-test_ruby_sdk() {
- cd "$WORKSPACE/sdk/ruby" \
- && bundle install --no-deployment \
- && bundle exec rake test
-}
-do_test ruby_sdk
+do_install docs
install_ruby_sdk() {
cd "$WORKSPACE/sdk/ruby" \
@@ -252,14 +239,25 @@ install_cli() {
}
do_install cli
-test_cli() {
- title "Starting SDK CLI tests"
- cd "$WORKSPACE/sdk/cli" \
- && bundle install --no-deployment \
- && mkdir -p /tmp/keep \
- && KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test $cli_test
+install_python_sdk() {
+ # Install the Python SDK early. Various other test suites (like
+ # keepproxy) bring up run_test_server.py, which imports the arvados
+ # module. We can't actually *test* the Python SDK yet though, because
+ # its own test suite brings up some of those other programs (like
+ # keepproxy).
+
+ cd "$WORKSPACE/sdk/python" \
+ && python setup.py egg_info -b ".$(git log --format=format:%ct.%h -n1 .)" sdist rotate --keep=1 --match .tar.gz \
+ && pip install dist/arvados-python-client-0.1.*.tar.gz
}
-do_test cli
+do_install python_sdk
+
+install_fuse() {
+ cd "$WORKSPACE/services/fuse" \
+ && python setup.py egg_info -b ".$(git log --format=format:%ct.%h -n1 .)" sdist rotate --keep=1 --match .tar.gz \
+ && pip install dist/arvados_fuse-0.1.*.tar.gz
+}
+do_install fuse
install_apiserver() {
cd "$WORKSPACE/services/api"
@@ -310,12 +308,6 @@ install_apiserver() {
}
do_install apiserver
-test_apiserver() {
- cd "$WORKSPACE/services/api"
- bundle exec rake test $apiserver_test
-}
-do_test apiserver
-
declare -a gostuff
gostuff=(
services/keepstore
@@ -329,25 +321,33 @@ do
do_install "$g" go
done
-install_python_sdk() {
- # Install the Python SDK early. Various other test suites (like
- # keepproxy) bring up run_test_server.py, which imports the arvados
- # module. We can't actually *test* the Python SDK yet though, because
- # its own test suite brings up some of those other programs (like
- # keepproxy).
+test_doclinkchecker() {
+ cd "$WORKSPACE/doc"
+ bundle exec rake linkchecker baseurl=file://$WORKSPACE/doc/.site/
+}
+do_test doclinkchecker
- cd "$WORKSPACE/sdk/python" \
- && python setup.py egg_info -b ".$(git log --format=format:%ct.%h -n1 .)" sdist rotate --keep=1 --match .tar.gz \
- && pip install dist/arvados-python-client-0.1.*.tar.gz
+test_ruby_sdk() {
+ cd "$WORKSPACE/sdk/ruby" \
+ && bundle install --no-deployment \
+ && bundle exec rake test
}
-do_install python_sdk
+do_test ruby_sdk
-install_fuse() {
- cd "$WORKSPACE/services/fuse" \
- && python setup.py egg_info -b ".$(git log --format=format:%ct.%h -n1 .)" sdist rotate --keep=1 --match .tar.gz \
- && pip install dist/arvados_fuse-0.1.*.tar.gz
+test_cli() {
+ title "Starting SDK CLI tests"
+ cd "$WORKSPACE/sdk/cli" \
+ && bundle install --no-deployment \
+ && mkdir -p /tmp/keep \
+ && KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test $cli_test
}
-do_install fuse
+do_test cli
+
+test_apiserver() {
+ cd "$WORKSPACE/services/api"
+ bundle exec rake test $apiserver_test
+}
+do_test apiserver
test_python_sdk() {
# Python SDK. We test this before testing keepproxy: keepproxy runs
commit 254c4352cf3f0fba7861bd51b42498e996036227
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 19 10:56:27 2014 -0400
3894: Use gem install --user-install to avoid sudo/rvm requirement
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index d6fc40a..44bb603 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -241,14 +241,14 @@ do_test ruby_sdk
install_ruby_sdk() {
cd "$WORKSPACE/sdk/ruby" \
&& gem build arvados.gemspec \
- && gem install --no-ri --no-rdoc `ls -t arvados-*.gem|head -n1`
+ && gem install --user-install --no-ri --no-rdoc `ls -t arvados-*.gem|head -n1`
}
do_install ruby_sdk
install_cli() {
cd "$WORKSPACE/sdk/cli" \
&& gem build arvados-cli.gemspec \
- && gem install --no-ri --no-rdoc `ls -t arvados-cli-*.gem|head -n1`
+ && gem install --user-install --no-ri --no-rdoc `ls -t arvados-cli-*.gem|head -n1`
}
do_install cli
commit cf97dfcc0a04149057688f302252d696c2d575fa
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 19 10:54:11 2014 -0400
3894: Scrub PYTHONPATH
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index f2cd322..d6fc40a 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -51,6 +51,7 @@ COLUMNS=80
GITDIR=
GOPATH=
VENVDIR=
+PYTHONPATH=
cli_test=
workbench_test=
apiserver_test=
commit 12a671a65b2cc1ec7431f8cd8b024cf70f269f7a
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 19 10:26:53 2014 -0400
3894: Use mktemp instead of $WORKSPACE/tmpgit for test repo
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 54c378b..f2cd322 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -48,6 +48,7 @@ unset $(env | cut -d= -f1 | grep \^ARVADOS_)
COLUMNS=80
+GITDIR=
GOPATH=
VENVDIR=
cli_test=
@@ -67,7 +68,7 @@ fi
declare -A leave_temp
clear_temp() {
leaving=""
- for var in VENVDIR GOPATH
+ for var in VENVDIR GOPATH GITDIR
do
if [[ -z "${leave_temp[$var]}" ]]
then
@@ -284,7 +285,7 @@ install_apiserver() {
export RAILS_ENV=test
# Set up empty git repo (for git tests)
- GITDIR="$WORKSPACE/tmpgit"
+ GITDIR=$(mktemp -d)
sed -i'' -e "s:/var/cache/git:$GITDIR:" config/application.default.yml
rm -rf $GITDIR
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list