[ARVADOS] updated: 49510014c88646ef4320b137240966ba8f6d5108

[Git user]

Summary of changes:
 .../crunch2-slurm/install-compute-node.html.textile.liquid |  6 ++----
 sdk/python/tests/run_test_server.py                        | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

       via  49510014c88646ef4320b137240966ba8f6d5108 (commit)
       via  5689f1de6e1a263237303b73013dcebb4ad77e1f (commit)
      from  f8084a54742def1915c9f4be290f9076033af152 (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 49510014c88646ef4320b137240966ba8f6d5108
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Mar 22 12:07:48 2017 -0400

    Fix broken link from crunch2 to crunch1 docs.
    
    refs #6520

diff --git a/doc/install/crunch2-slurm/install-compute-node.html.textile.liquid b/doc/install/crunch2-slurm/install-compute-node.html.textile.liquid
index 330cc3a..25e105b 100644
--- a/doc/install/crunch2-slurm/install-compute-node.html.textile.liquid
+++ b/doc/install/crunch2-slurm/install-compute-node.html.textile.liquid
@@ -33,8 +33,6 @@ On Debian-based systems:
 
 h2. Set up SLURM
 
-Install SLURM following "the same process you used to install the Crunch dispatcher":install-crunch-dispatch.html#slurm.
+Install SLURM on the compute node using the same process you used on the API server in the "previous step":install-slurm.html.
 
-h2. Copy configuration files from the dispatcher (API server)
-
-The @slurm.conf@ and @/etc/munge/munge.key@ files need to be identical across the dispatcher and all compute nodes. Copy the files you created in the "Install the Crunch dispatcher":install-crunch-dispatch.html step to this compute node.
+The @slurm.conf@ and @/etc/munge/munge.key@ files must be identical on all SLURM nodes. Copy the files you created on the API server in the "previous step":install-slurm.html to each compute node.

commit 5689f1de6e1a263237303b73013dcebb4ad77e1f
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Mar 22 12:04:43 2017 -0400

    Do not let golang.org/x/tools/cmd/bundle get ahead of Ruby bundler.
    
    refs https://dev.arvados.org/projects/arvados/wiki/Emacs_and_Go
    
    No issue #

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 776ff72..da35f4f 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -34,9 +34,19 @@ import arvados.config
 ARVADOS_DIR = os.path.realpath(os.path.join(MY_DIRNAME, '../../..'))
 SERVICES_SRC_DIR = os.path.join(ARVADOS_DIR, 'services')
 if 'GOPATH' in os.environ:
+    # Add all GOPATH bin dirs to PATH -- but insert them after the
+    # ruby gems bin dir, to ensure "bundle" runs the Ruby bundler
+    # command, not the golang.org/x/tools/cmd/bundle command.
     gopaths = os.environ['GOPATH'].split(':')
-    gobins = [os.path.join(path, 'bin') for path in gopaths]
-    os.environ['PATH'] = ':'.join(gobins) + ':' + os.environ['PATH']
+    addbins = [os.path.join(path, 'bin') for path in gopaths]
+    newbins = []
+    for path in os.environ['PATH'].split(':'):
+        newbins.append(path)
+        if os.path.exists(os.path.join(path, 'bundle')):
+            newbins += addbins
+            addbins = []
+    newbins += addbins
+    os.environ['PATH'] = ':'.join(newbins)
 
 TEST_TMPDIR = os.path.join(ARVADOS_DIR, 'tmp')
 if not os.path.exists(TEST_TMPDIR):

-----------------------------------------------------------------------


hooks/post-receive
--