diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-07-07 22:21:37 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-07-10 02:03:15 +0200 |
| commit | 7305131c6ba5ea0f9f077ee99d2741c5f47bddb9 (patch) | |
| tree | d461b769b135d1580525ca1eff6d9a83ed1ac4c0 /docker/Dockerfile | |
| parent | bde3bcb27574b5ace25021de5ed2303161995cc9 (diff) | |
Download Functest's upper-constraints.txt
It also removes all temporarily files [1] and reuses OPENSTACK_TAG
and BRANCH args.
[1] https://gerrit.opnfv.org/gerrit/37077
Change-Id: Id87ffdf14ccb1a34f117241c882423adf79f44c5
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 81d5167e..accbf5e3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,6 +15,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container" ARG BRANCH=master ARG RALLY_TAG=0.8.1 ARG ODL_TAG=release/beryllium-sr4 +ARG OPENSTACK_TAG=stable/ocata ARG KINGBIRD_TAG=1.1.0 ARG VIMS_TAG=stable ARG VROUTER_TAG=stable @@ -70,17 +71,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 | \ +RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > o-upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \ + > upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ -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 o-upper-constraints.txt + rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper |