Merge pull request #5113 from jtattermusch/node_distribtest_fixes

Node distribtest fixes
pull/5126/head
Michael Lumish 9 years ago
commit 469e2fd3fb
  1. 7
      test/distrib/node/run_distrib_test.sh
  2. 4
      tools/dockerfile/distribtest/node_jessie_x86/Dockerfile
  3. 3
      tools/run_tests/distribtest_targets.py

@ -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

@ -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

@ -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

Loading…
Cancel
Save