[ARVADOS-DEV] updated: 9932d701d2ebe1d8f9d04aeaef701a1e7b616852
git at public.curoverse.com
git at public.curoverse.com
Sun Jul 5 11:55:27 EDT 2015
Summary of changes:
jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh | 5 ++---
jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
via 9932d701d2ebe1d8f9d04aeaef701a1e7b616852 (commit)
from e18701a42562461556c3fac9013abf76f29f44fd (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 9932d701d2ebe1d8f9d04aeaef701a1e7b616852
Author: Brett Smith <brett at curoverse.com>
Date: Sun Jul 5 11:55:25 2015 -0400
Bugfix config:check error detection in Rails upgrade scripts.
The previous code was capturing the exit status of echo, which isn't
very interesting. No issue #.
diff --git a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
index cf32fdb..5af5487 100755
--- a/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
+++ b/jenkins/arvados-api-server-extras/arvados-api-server-upgrade.sh
@@ -45,10 +45,9 @@ chmod 644 $SHARED_PATH/log/*
echo "Done."
echo "Running sanity check"
-(cd $RELEASE_PATH; RAILS_ENV=production bundle exec rake config:check)
-echo "Done."
-
+(cd $RELEASE_PATH && RAILS_ENV=production bundle exec rake config:check)
SANITY_CHECK_EXIT_CODE=$?
+echo "Done."
if [[ "$SANITY_CHECK_EXIT_CODE" != "0" ]]; then
echo "Sanity check failed, aborting. Please roll back to the previous version of the package."
diff --git a/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh b/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
index 33e05d3..5b89ec7 100755
--- a/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
+++ b/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
@@ -39,10 +39,9 @@ chmod 644 $SHARED_PATH/log/*
echo "Done."
echo "Running sanity check"
-(cd $RELEASE_PATH; RAILS_ENV=production bundle exec rake config:check)
-echo "Done."
-
+(cd $RELEASE_PATH && RAILS_ENV=production bundle exec rake config:check)
SANITY_CHECK_EXIT_CODE=$?
+echo "Done."
if [[ "$SANITY_CHECK_EXIT_CODE" != "0" ]]; then
echo "Sanity check failed, aborting. Please roll back to the previous version of the package."
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list