[ARVADOS] updated: 7926ff7028d577a1c77eab0c8bd94d3959146b1a
Git user
git at public.curoverse.com
Wed Jul 20 16:03:53 EDT 2016
Summary of changes:
build/run-tests.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
via 7926ff7028d577a1c77eab0c8bd94d3959146b1a (commit)
from e6cd7c31ee28851d3ead992437fc93f2fc73ef92 (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 7926ff7028d577a1c77eab0c8bd94d3959146b1a
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Jul 20 16:03:18 2016 -0400
9639: Avoid sharing rvm gemsets between concurrent builds.
refs #9639
diff --git a/build/run-tests.sh b/build/run-tests.sh
index b7aa44d..31d8c0c 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -342,9 +342,12 @@ setup_ruby_environment() {
# complaint about not being in first place already.
rvm use @default 2>/dev/null
- # Create (if needed) and switch to an @arvados-tests
- # gemset. (Leave the choice of ruby to the caller.)
- rvm use @arvados-tests --create \
+ # Create (if needed) and switch to an @arvados-tests-* gemset,
+ # salting the gemset name so it doesn't interfere with
+ # concurrent builds in other workspaces. Leave the choice of
+ # ruby to the caller.
+ gemset="arvados-tests-$(echo -n "${WORKSPACE}" | md5sum | head -c16)"
+ rvm use "@${gemset}" --create \
|| fatal 'rvm gemset setup'
rvm env
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list