summaryrefslogtreecommitdiffstats
path: root/docker/smoke/Dockerfile
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-07 22:21:37 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-10 02:03:15 +0200
commit7305131c6ba5ea0f9f077ee99d2741c5f47bddb9 (patch)
treed461b769b135d1580525ca1eff6d9a83ed1ac4c0 /docker/smoke/Dockerfile
parentbde3bcb27574b5ace25021de5ed2303161995cc9 (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/smoke/Dockerfile')
-rw-r--r--docker/smoke/Dockerfile11
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