From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 10 Aug 2017 16:07:45 +0000 (+0200)
Subject: Keep the promise working dir in /src
X-Git-Tag: opnfv-5.0.RC1~207
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F39077%2F1;p=functest.git

Keep the promise working dir in /src

Otherwise npm install fails.

Change-Id: I1be15bc83e0dfab1ad1471106326ff347385f31e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 54d526d67..6f53e8d33 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -120,7 +120,7 @@ RUN /bin/bash -c ". /etc/profile.d/rvm.sh \
 
 RUN sh -c 'curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -' \
     && sudo apt-get install -y nodejs \
-    && cd ${REPOS_DIR}/promise && sudo npm -g install npm@latest \
-    && cd ${REPOS_DIR}/promise/source && npm install
+    && cd /src/promise && sudo npm -g install npm@latest \
+    && cd /src/promise/source && npm install
 
 RUN echo ". ${FUNCTEST_DIR}/cli/functest-complete.sh" >> /root/.bashrc
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 15d81ee79..ea6a48448 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -5,7 +5,7 @@ git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
 git+https://gerrit.opnfv.org/gerrit/opera#egg=opera
 git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning
 git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
-git+https://gerrit.opnfv.org/gerrit/promise#egg=promise&subdirectory=promise/test/functest
+-e git+https://gerrit.opnfv.org/gerrit/promise#egg=promise&subdirectory=promise/test/functest
 git+https://gerrit.opnfv.org/gerrit/netready#egg=netready&subdirectory=test/functest
 -e git+https://github.com/openstack/refstack-client#egg=refstack-client
 cloudify_rest_client===4.0