diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-05 15:43:07 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-11-05 15:50:38 +0100 |
| commit | f77c464a9bf40b36586843ae59e6764216477c4b (patch) | |
| tree | 11b3c470687633d7d4028d1e18d15de8c302730a /docker | |
| parent | 84f82d02630c22e8054266c8c0a53ffb805c2071 (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>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/parser/Dockerfile | 12 | ||||
| -rw-r--r-- | docker/parser/thirdparty-requirements.txt | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile index c98850c2..c906ad9f 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 00000000..9981404d --- /dev/null +++ b/docker/parser/thirdparty-requirements.txt @@ -0,0 +1,3 @@ +nfv-heattranslator +nfv-toscaparser +nfv-parser |