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/smoke/Dockerfile | |
| parent | 451dc20e8da42f0aaff9b563d08b4c4abab67b33 (diff) | |
| parent | 7305131c6ba5ea0f9f077ee99d2741c5f47bddb9 (diff) | |
Merge "Download Functest's upper-constraints.txt"
Diffstat (limited to 'docker/smoke/Dockerfile')
| -rw-r--r-- | docker/smoke/Dockerfile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 5a3b59be6..b037728ae 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,15 +1,18 @@ FROM ollivier/functest-core +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/ocata + COPY thirdparty-requirements.txt thirdparty-requirements.txt -COPY upper-constraints.txt upper-constraints.txt RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ - pip install --src /src -cupper-constraints.txt \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \ + pip install --src /src \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -rthirdparty-requirements.txt && \ ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm thirdparty-requirements.txt upper-constraints.txt && \ + rm thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml |