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/core | |
| 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/core')
| -rw-r--r-- | docker/core/Dockerfile | 15 | ||||
| -rw-r--r-- | docker/core/upper-constraints.txt | 17 |
2 files changed, 9 insertions, 23 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 4aa9e5c41..ef9f0e2d2 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,18 +1,21 @@ FROM alpine:3.6 -COPY upper-constraints.txt upper-constraints.txt +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/ocata + RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ grep sed wget ca-certificates git && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ + 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 \ - git+https://gerrit.opnfv.org/gerrit/functest#egg=functest && \ - rm upper-constraints.txt o-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 && \ + rm upper-constraints.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 && \ diff --git a/docker/core/upper-constraints.txt b/docker/core/upper-constraints.txt deleted file mode 100644 index 73ec7f41b..000000000 --- a/docker/core/upper-constraints.txt +++ /dev/null @@ -1,17 +0,0 @@ -git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules -git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps -git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests -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 --e git+https://github.com/openstack/refstack-client#egg=refstack-client -cloudify_rest_client===4.0 -iniparse===0.4 -openbaton-cli===2.2.1b7 -robotframework===3.0.2 -robotframework-httplibrary===0.4.2 -robotframework-requests===0.4.7 -robotframework-sshlibrary===2.1.3;python_version=='2.7' -kingbird===1.1.0 -rally===0.9.1 |