summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-05 15:43:07 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-05 15:50:38 +0100
commitf77c464a9bf40b36586843ae59e6764216477c4b (patch)
tree11b3c470687633d7d4028d1e18d15de8c302730a
parent84f82d02630c22e8054266c8c0a53ffb805c2071 (diff)
Define thirdparty-requirements.txt for functest-parser
As Parser python packages has been renamed, they can be defined in upper-constraints.txt. No conflict can occur between them and the official OpenStack packages. The Parser testcase still requires a dedicated container to avoid conflicts in namespaces. Change-Id: Ic8d18140f26e72d1e3d04b73d301d3fd870b171a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/parser/Dockerfile12
-rw-r--r--docker/parser/thirdparty-requirements.txt3
-rw-r--r--upper-constraints.txt3
3 files changed, 10 insertions, 8 deletions
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index c98850c28..c906ad9fc 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -5,10 +5,8 @@ ARG OPENSTACK_TAG=stable/pike
ARG RALLY_TAG=stable/0.10
ARG OS_FAULTS_TAG=0.1.16
-RUN apk --no-cache add --update \
- python libffi libssl1.0 libjpeg-turbo py-pip bash \
- grep sed wget ca-certificates git openssh-client && \
- apk --no-cache add --virtual .build-deps --update \
+COPY thirdparty-requirements.txt thirdparty-requirements.txt
+RUN 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=$OPENSTACK_TAG | \
@@ -16,10 +14,8 @@ RUN apk --no-cache add --update \
> upper-constraints.txt && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-heattranslator\&subdirectory=tosca2heat/heat-translator \
- git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser\&subdirectory=tosca2heat/tosca-parser \
- -e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser && \
- rm upper-constraints.txt && \
+ -rthirdparty-requirements.txt && \
+ rm upper-constraints.txt thirdparty-requirements.txt && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/parser/thirdparty-requirements.txt b/docker/parser/thirdparty-requirements.txt
new file mode 100644
index 000000000..9981404d6
--- /dev/null
+++ b/docker/parser/thirdparty-requirements.txt
@@ -0,0 +1,3 @@
+nfv-heattranslator
+nfv-toscaparser
+nfv-parser
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 78d8bc961..8a4f9e1c8 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -6,6 +6,9 @@ git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
-e git+https://gerrit.opnfv.org/gerrit/promise#egg=promise
-e git+https://gerrit.opnfv.org/gerrit/doctor#egg=doctor-tests
git+https://gerrit.opnfv.org/gerrit/domino#egg=domino
+git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-heattranslator&subdirectory=tosca2heat/heat-translator
+git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser&subdirectory=tosca2heat/tosca-parser
+-e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser
cloudify-rest-client===4.0
iniparse===0.4
openbaton-cli===2.2.1b7