summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-07 20:09:41 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-10 02:03:15 +0200
commitbde3bcb27574b5ace25021de5ed2303161995cc9 (patch)
tree32bf05e2b0a873543dad0f7b9f0e72812645a672 /docker/Dockerfile
parentf15da4871f064a9d1d7f6adfecc420374bcb2546 (diff)
Add upper-constraints.txt for Functest
It completes OpenStack's upper-constraints.txt by adding Functest's requirements. This file is temporarily duplicated to allow building the containers. It will be removed via a next patch when this patch is merged. openbaton-cli could be updated (e.g. 3.2.8). Change-Id: I26de2d22f9e8973c5a58c3cc5129142fa628e57a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile11
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7db184f43..81d5167ea 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -70,18 +70,17 @@ RUN mkdir -p ${REPOS_VNFS_DIR} \
RUN git config --global http.sslVerify false
COPY thirdparty-requirements.txt thirdparty-requirements.txt
+COPY upper-constraints.txt upper-constraints.txt
RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \
sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
- > upper-constraints.txt && \
- pip install --src /src -cupper-constraints.txt \
+ > o-upper-constraints.txt && \
+ pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \
git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
- git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \
- git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \
- -r thirdparty-requirements.txt && \
+ -rthirdparty-requirements.txt && \
mkdir -p /etc/rally && \
printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
mkdir -p /var/lib/rally/database && rally-manage db create && \
- rm thirdparty-requirements.txt upper-constraints.txt
+ rm thirdparty-requirements.txt upper-constraints.txt o-upper-constraints.txt
# OPNFV repositories
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper