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)

diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index 66855dc..d691b64 100644 (file)
--- 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 (file)
index 0000000..9981404
--- /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 f64c3e0..0314dd2 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -6,6 +6,9 @@ git+https://gerrit.opnfv.org/gerrit/sfc@stable/euphrates#egg=sfc
 -e git+https://gerrit.opnfv.org/gerrit/promise@stable/euphrates#egg=promise
 -e git+https://gerrit.opnfv.org/gerrit/doctor@stable/euphrates#egg=doctor-tests
 git+https://gerrit.opnfv.org/gerrit/domino@stable/euphrates#egg=domino
+git+https://gerrit.opnfv.org/gerrit/parser@stable/euphrates#egg=nfv-heattranslator&subdirectory=tosca2heat/heat-translator
+git+https://gerrit.opnfv.org/gerrit/parser@stable/euphrates#egg=nfv-toscaparser&subdirectory=tosca2heat/tosca-parser
+-e git+https://gerrit.opnfv.org/gerrit/parser@stable/euphrates#egg=nfv-parser
 cloudify-rest-client===4.0
 iniparse===0.4
 openbaton-cli===2.2.1b7