Permalink
Browse files

Add Node.js paths to vcap-staging tests

Change-Id: I7f5286ff2f63ea4b61de6f1cccabb362a8a2e952
  • Loading branch information...
1 parent 3732803 commit 06146bf499b4cdfc87fe74af5e858556261c5595 @mariash mariash committed Sep 12, 2012
Showing with 13 additions and 1 deletion.
  1. +13 −1 src/jenkins_jobs/VCAP_STAGING_TESTS/config.xml.erb
@@ -96,9 +96,17 @@ SPEC_DIR=$STAGING_DIR/spec/reports
# Paths needed in the container
DEA_RUBY18_REALPATH=`readlink -nf $DEA_RUBY18`
DEA_RUBY18_BD=$DEA_RUBY18_REALPATH/bin
+
DEA_RUBY19_REALPATH=`readlink -nf $DEA_RUBY19`
DEA_RUBY19_BD=$DEA_RUBY19_REALPATH/bin
DEA_RUBY19_VER=`$DEA_RUBY19_BD/ruby --version | awk '{ print $2 }'`
+
+DEA_NODE04_REALPATH=`readlink -nf $DEA_NODE04`
+DEA_NODE04_BD=$DEA_NODE04_REALPATH/bin
+
+DEA_NODE06_REALPATH=`readlink -nf $DEA_NODE06`
+DEA_NODE06_BD=$DEA_NODE06_REALPATH/bin
+
GIT_REALPATH=$(readlink -nf $VCAP_GIT)
$GIT_REALPATH/bin/git submodule update --init --recursive
@@ -114,6 +122,10 @@ set -o xtrace
export VCAP_RUNTIME_RUBY18=$DEA_RUBY18_BD/ruby
export VCAP_RUNTIME_RUBY19=$DEA_RUBY19_BD/ruby
export VCAP_RUNTIME_RUBY19_VER=$DEA_RUBY19_VER
+
+export VCAP_RUNTIME_NODE04=$DEA_NODE04_BD/node
+export VCAP_RUNTIME_NODE06=$DEA_NODE06_BD/node
+
export PATH=$GIT_REALPATH/bin:$DEA_RUBY19_BD:$PATH
cd /tmp/staging
bundle install --deployment --without development production
@@ -122,7 +134,7 @@ EOT
chmod +x $TEST_RUNNER
-HANDLE=`$CREATE_CONTAINER $GIT_REALPATH $DEA_RUBY19_REALPATH $DEA_RUBY18_REALPATH`
+HANDLE=`$CREATE_CONTAINER $GIT_REALPATH $DEA_RUBY19_REALPATH $DEA_RUBY18_REALPATH $DEA_NODE06_REALPATH`
$WARDEN_REPL -xec "
copy $HANDLE in $STAGING_DIR/ /tmp/staging
copy $HANDLE in $TEST_RUNNER /tmp

0 comments on commit 06146bf

Please sign in to comment.