diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-08-10 18:07:45 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-08-10 18:08:55 +0200 |
| commit | e91c5d62fff72089ba52c35a198f1f7a40ee9e17 (patch) | |
| tree | 21e830d2e81c9e697a78949be5c8e66c3a5a7adc | |
| parent | d1704a679ce7d4d8251d9f6e057d47333b2923fe (diff) | |
Keep the promise working dir in /src
Otherwise npm install fails.
Change-Id: I1be15bc83e0dfab1ad1471106326ff347385f31e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | upper-constraints.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 54d526d6..6f53e8d3 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 15d81ee7..ea6a4844 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 |