commit 469e2fd3fb46478173a8604690170486cfaff781
author Michael Lumish <mlumish@google.com> Mon Feb 08 10:55:44 2016 -0800
committer Michael Lumish <mlumish@google.com> Mon Feb 08 10:55:44 2016 -0800
tree df2dfa5eaebd8e578a782e421c11ee3bd0d7d4aa
parent f06fea37d0976d823ec799033f985eec56c09d16
parent 474ccfcaedad31ce896a59b8100174a2c7d25ac7

Merge pull request #5113 from jtattermusch/node_distribtest_fixes

Node distribtest fixes

test/distrib/node/run_distrib_test.sh

diff --git a/test/distrib/node/run_distrib_test.sh b/test/distrib/node/run_distrib_test.sh
index 90637cc..ac9e7d7 100755
--- a/test/distrib/node/run_distrib_test.sh
+++ b/test/distrib/node/run_distrib_test.sh
@@ -32,7 +32,12 @@
 
 cd $(dirname $0)
 
-nvm install $1
+NODE_VERSION="$1"
+
+# make sure nvm is available
+source ~/.nvm/nvm.sh || true
+
+nvm install $NODE_VERSION
 
 npm install -g node-static
 

tools/dockerfile/distribtest/node_jessie_x86/Dockerfile

diff --git a/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
index bd40ab2..8b97d8b 100644
--- a/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
+++ b/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
@@ -29,8 +29,8 @@
 
 FROM 32bit/debian:jessie
 
-RUN apt-get update && apt-get install -y git
+RUN apt-get update && apt-get install -y curl
 
 # Install nvm
 RUN touch .profile
-RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
\ No newline at end of file
+RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash

tools/run_tests/distribtest_targets.py

diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py
index a1e45ec..f3ebc00 100644
--- a/tools/run_tests/distribtest_targets.py
+++ b/tools/run_tests/distribtest_targets.py
@@ -105,8 +105,7 @@
                                  'tools/dockerfile/distribtest/node_%s_%s' % (
                                      self.docker_suffix,
                                      self.arch),
-                                 # bash -l needed to make nvm available
-                                 'bash -l test/distrib/node/run_distrib_test.sh %s' % (
+                                 'test/distrib/node/run_distrib_test.sh %s' % (
                                      self.node_version))
     def __str__(self):
       return self.name