summaryrefslogtreecommitdiffstats
path: root/docker
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 16:08:14 +0100
commitabd7a52b2d8764b074f68e026c4a66191e32b35e (patch)
tree13fd3ae4dc528c5796c94fba32e169f1ad57894c /docker
parent068930b5b0a014dd569036f551ae164bbfec8d4d (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. Conflicts: docker/parser/Dockerfile upper-constraints.txt Change-Id: Ic8d18140f26e72d1e3d04b73d301d3fd870b171a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit f77c464a9bf40b36586843ae59e6764216477c4b)
Diffstat (limited to 'docker')
-rw-r--r--docker/parser/Dockerfile7
-rw-r--r--docker/parser/thirdparty-requirements.txt3
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index 66855dc92..d691b64f8 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -4,6 +4,7 @@ ARG BRANCH=stable/euphrates
ARG OPENSTACK_TAG=stable/pike
ARG RALLY_TAG=0.9.1
+COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update \
python libffi libssl1.0 libjpeg-turbo py-pip bash \
grep sed wget ca-certificates git openssh-client && \
@@ -25,10 +26,8 @@ RUN apk --no-cache add --update \
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/functest@$BRANCH#egg=functest \
- 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 -r upper-constraints.txt /src/rally/.git && \
+ -rthirdparty-requirements.txt && \
+ rm -r upper-constraints.txt thirdparty-requirements.txt /src/rally/.git && \
mkdir -p /etc/rally && \
printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
mkdir -p /var/lib/rally/database && rally-manage db create && \
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