Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move testcases in the right tiers
[functest.git]
/
docker
/
healthcheck
/
Dockerfile
diff --git
a/docker/healthcheck/Dockerfile
b/docker/healthcheck/Dockerfile
index
aba2bbd
..
1932c45
100644
(file)
--- a/
docker/healthcheck/Dockerfile
+++ b/
docker/healthcheck/Dockerfile
@@
-1,11
+1,13
@@
-FROM opnfv/functest-
core
+FROM opnfv/functest-
tempest
ARG BRANCH=master
ARG OPENSTACK_TAG=master
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
COPY thirdparty-requirements.txt thirdparty-requirements.txt
ARG BRANCH=master
ARG OPENSTACK_TAG=master
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
+RUN apk --no-cache add --virtual .build-deps --update \
+ python-dev build-base linux-headers libffi-dev openssl-dev && \
+ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
@@
-17,6
+19,7
@@
RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
git fetch --tags https://git.opendaylight.org/gerrit/p/integration/test.git $ODL_TAG && \
git checkout FETCH_HEAD) && \
rm -r /src/odl_test/.git thirdparty-requirements.txt upper-constraints.txt \
git fetch --tags https://git.opendaylight.org/gerrit/p/integration/test.git $ODL_TAG && \
git checkout FETCH_HEAD) && \
rm -r /src/odl_test/.git thirdparty-requirements.txt upper-constraints.txt \
- upper-constraints.opnfv.txt
+ upper-constraints.opnfv.txt && \
+ apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]