From 0bd1da55936bae4bdd82ef40526b5de6105c8624 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Fri, 5 Feb 2016 20:21:17 -0800
Subject: [PATCH] fix some node distribtests
---
test/distrib/node/run_distrib_test.sh | 7 ++++++-
tools/dockerfile/distribtest/node_jessie_x86/Dockerfile | 2 +-
tools/run_tests/distribtest_targets.py | 3 +--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/test/distrib/node/run_distrib_test.sh b/test/distrib/node/run_distrib_test.sh
index 90637cc01d..ac9e7d7090 100755
--- 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
index bd40ab2b4c..0408cbeeb0 100644
--- a/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
+++ b/tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
@@ -29,7 +29,7 @@
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
diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py
index a1e45ece9d..f3ebc00b4e 100644
--- a/tools/run_tests/distribtest_targets.py
+++ b/tools/run_tests/distribtest_targets.py
@@ -105,8 +105,7 @@ class NodeDistribTest(object):
'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
--
GitLab