Merge pull request grpc#5113 from jtattermusch/node_distribtest_fixes

Node distribtest fixes
oza · Feb 8, 2016 · 469e2fd · 469e2fd
2 parents f06fea3 + 474ccfc
commit 469e2fd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/test/distrib/node/run_distrib_test.sh b/test/distrib/node/run_distrib_test.sh
@@ -32,7 +32,12 @@ set -ex
 
 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
 

diff --git 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
+RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py
@@ -105,8 +105,7 @@ def build_jobspec(self):
                                  '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