[ARVADOS-DEV] updated: a526319c2a822c1a2b06b09d734fa3da6f84ec31
git at public.curoverse.com
git at public.curoverse.com
Mon Feb 2 15:38:49 EST 2015
Summary of changes:
jenkins/run-tests.sh | 49 ++++++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 21 deletions(-)
via a526319c2a822c1a2b06b09d734fa3da6f84ec31 (commit)
via e925baa047b64d387c539473746b495972310813 (commit)
via a6969ab968422f146df9cf9ef301fb5b0b422ded (commit)
via 3e70317d25333921718191ac3ba9be91e0408449 (commit)
from 440a06656f8c81cf3d7757dd00991872683fc513 (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 a526319c2a822c1a2b06b09d734fa3da6f84ec31
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Feb 2 10:27:01 2015 -0500
3021: Fix up some error checking.
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 98734ca..07f5cdd 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -533,17 +533,17 @@ do_install apps/workbench workbench
start_api() {
echo 'Starting API server...'
- cd "$WORKSPACE" && \
- eval $(python sdk/python/tests/run_test_server.py start --auth admin) && \
- export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" && \
- export ARVADOS_TEST_API_INSTALLED="$$" && \
- (env | egrep ^ARVADOS)
+ cd "$WORKSPACE" \
+ && eval $(python sdk/python/tests/run_test_server.py start --auth admin) \
+ && export ARVADOS_TEST_API_HOST="$ARVADOS_API_HOST" \
+ && export ARVADOS_TEST_API_INSTALLED="$$" \
+ && (env | egrep ^ARVADOS)
}
stop_api() {
unset ARVADOS_TEST_API_HOST
- cd "$WORKSPACE" && \
- python sdk/python/tests/run_test_server.py stop
+ cd "$WORKSPACE" \
+ && python sdk/python/tests/run_test_server.py stop
}
test_doclinkchecker() {
@@ -561,8 +561,8 @@ do_test doc doclinkchecker
stop_api
test_apiserver() {
- cd "$WORKSPACE/services/api"
- RAILS_ENV=test bundle exec rake test ${testargs[services/api]}
+ cd "$WORKSPACE/services/api" \
+ && RAILS_ENV=test bundle exec rake test ${testargs[services/api]}
}
do_test services/api apiserver
commit e925baa047b64d387c539473746b495972310813
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Feb 2 05:29:38 2015 -0500
3021: Cache packages with bundle package --all
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index febe276..98734ca 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -417,6 +417,7 @@ install_doc() {
cd "$WORKSPACE/doc" \
&& (bundle install --local --no-deployment \
|| bundle install --no-deployment) \
+ && bundle package --all \
&& rm -rf .site
}
do_install doc
@@ -426,6 +427,7 @@ install_ruby_sdk() {
&& cd "$WORKSPACE/sdk/ruby" \
&& (bundle install --local --no-deployment \
|| bundle install --no-deployment) \
+ && bundle package --all \
&& gem build arvados.gemspec \
&& with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-*.gem|head -n1`
}
@@ -436,6 +438,7 @@ install_cli() {
&& cd "$WORKSPACE/sdk/cli" \
&& (bundle install --local --no-deployment \
|| bundle install --no-deployment) \
+ && bundle package --all \
&& gem build arvados-cli.gemspec \
&& with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-cli-*.gem|head -n1`
}
@@ -460,7 +463,8 @@ done
install_apiserver() {
cd "$WORKSPACE/services/api" \
&& (RAILS_ENV=test bundle install --local --no-deployment \
- || RAILS_ENV=test bundle install --no-deployment)
+ || RAILS_ENV=test bundle install --no-deployment) \
+ && bundle package --all
rm -f config/environments/test.rb
cp config/environments/test.rb.example config/environments/test.rb
@@ -522,7 +526,8 @@ done
install_workbench() {
cd "$WORKSPACE/apps/workbench" \
&& (RAILS_ENV=test bundle install --local --no-deployment \
- || RAILS_ENV=test bundle install --no-deployment)
+ || RAILS_ENV=test bundle install --no-deployment) \
+ && bundle package --all
}
do_install apps/workbench workbench
commit a6969ab968422f146df9cf9ef301fb5b0b422ded
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Feb 2 05:27:49 2015 -0500
3021: Let integration tests write to the api server log before rotating it.
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 63c1d7c..febe276 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -561,8 +561,6 @@ test_apiserver() {
}
do_test services/api apiserver
-rotate_logfile "$WORKSPACE/services/api/log/" "test.log"
-
start_api
test_ruby_sdk() {
@@ -609,6 +607,7 @@ do_test apps/workbench_profile workbench_profile
rotate_logfile "$WORKSPACE/apps/workbench/log/" "test.log"
stop_api
+rotate_logfile "$WORKSPACE/services/api/log/" "test.log"
report_outcomes
clear_temp
commit 3e70317d25333921718191ac3ba9be91e0408449
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Feb 2 03:24:48 2015 -0500
3021: Try bundle install --local before resorting to downloading the internet.
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 87441f0..63c1d7c 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -414,16 +414,18 @@ title () {
}
install_doc() {
- cd "$WORKSPACE/doc"
- bundle install --no-deployment
- rm -rf .site
+ cd "$WORKSPACE/doc" \
+ && (bundle install --local --no-deployment \
+ || bundle install --no-deployment) \
+ && rm -rf .site
}
do_install doc
install_ruby_sdk() {
with_test_gemset gem uninstall --force --all --executables arvados \
&& cd "$WORKSPACE/sdk/ruby" \
- && bundle install --no-deployment \
+ && (bundle install --local --no-deployment \
+ || bundle install --no-deployment) \
&& gem build arvados.gemspec \
&& with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-*.gem|head -n1`
}
@@ -432,7 +434,8 @@ do_install sdk/ruby ruby_sdk
install_cli() {
with_test_gemset gem uninstall --force --all --executables arvados-cli \
&& cd "$WORKSPACE/sdk/cli" \
- && bundle install --no-deployment \
+ && (bundle install --local --no-deployment \
+ || bundle install --no-deployment) \
&& gem build arvados-cli.gemspec \
&& with_test_gemset gem install --no-ri --no-rdoc `ls -t arvados-cli-*.gem|head -n1`
}
@@ -455,8 +458,9 @@ do
done
install_apiserver() {
- cd "$WORKSPACE/services/api"
- RAILS_ENV=test bundle install --no-deployment
+ cd "$WORKSPACE/services/api" \
+ && (RAILS_ENV=test bundle install --local --no-deployment \
+ || RAILS_ENV=test bundle install --no-deployment)
rm -f config/environments/test.rb
cp config/environments/test.rb.example config/environments/test.rb
@@ -517,7 +521,8 @@ done
install_workbench() {
cd "$WORKSPACE/apps/workbench" \
- && RAILS_ENV=test bundle install --no-deployment
+ && (RAILS_ENV=test bundle install --local --no-deployment \
+ || RAILS_ENV=test bundle install --no-deployment)
}
do_install apps/workbench workbench
@@ -562,14 +567,12 @@ start_api
test_ruby_sdk() {
cd "$WORKSPACE/sdk/ruby" \
- && bundle install --no-deployment \
&& bundle exec rake test ${testargs[sdk/ruby]}
}
do_test sdk/ruby ruby_sdk
test_cli() {
cd "$WORKSPACE/sdk/cli" \
- && bundle install --no-deployment \
&& mkdir -p /tmp/keep \
&& KEEP_LOCAL_STORE=/tmp/keep bundle exec rake test ${testargs[sdk/cli]}
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list