diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-07-11 08:10:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-11 08:10:07 +0000 |
| commit | 450953c1b29335737e3c4e65e8cd917129eb2bb7 (patch) | |
| tree | 129cc6161f38edf0888b80fd097c4b31136b639c /docker/Dockerfile.aarch64 | |
| parent | 451dc20e8da42f0aaff9b563d08b4c4abab67b33 (diff) | |
| parent | 7305131c6ba5ea0f9f077ee99d2741c5f47bddb9 (diff) | |
Merge "Download Functest's upper-constraints.txt"
Diffstat (limited to 'docker/Dockerfile.aarch64')
| -rw-r--r-- | docker/Dockerfile.aarch64 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 1140eaddf..abd4d1afb 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -15,6 +15,7 @@ LABEL version="0.1" description="OPNFV Functest Aarch64 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=0.2.2 ARG VIMS_TAG=stable ARG REPOS_DIR=/home/opnfv/repos @@ -69,17 +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 | \ +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 |