From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 6 Oct 2018 09:37:26 +0000 (+0200)
Subject: Read thirdparty-requirements.txt if py3
X-Git-Tag: opnfv-7.0.0~25
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a8441958fd1bfec04178d3ff9d58d6977bc7ae31;p=functest.git

Read thirdparty-requirements.txt if py3

It fixes the current build issues due to unsynced doctor [1].

[1] https://build.opnfv.org/ci/job/functest-features-docker-build-arm64-master/455/console

Change-Id: Iad8b667e2615dcd976cd8120e4204665134922b7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 01509097c7447ee70d61f7e97d7947b127425eac)
---

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index aaa7ee836..616cb2445 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -21,8 +21,9 @@ RUN apk --no-cache add --update python3 sshpass && \
     pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -cupper-constraints.opnfv.txt \
         -rthirdparty-requirements.txt && \
-    python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
-        doctor-tests && \
+    python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
+        -cupper-constraints.opnfv.txt \
+        -rthirdparty-requirements.txt && \
     rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt /src/fds/.git && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index 510b3e6f6..27d0c15f0 100644
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -1,8 +1,8 @@
-robotframework-httplibrary
-robotframework-requests
-robotframework-sshlibrary;python_version=='2.7'
-baro_tests
-sdnvpn
-sfc
-stor4nfv_tests
+robotframework-httplibrary;python_version<'3.0'
+robotframework-requests;python_version<'3.0'
+robotframework-sshlibrary;python_version<'3.0'
+baro_tests;python_version<'3.0'
+sdnvpn;python_version<'3.0'
+sfc;python_version<'3.0'
+stor4nfv_tests;python_version<'3.0'
 doctor-tests;python_version>='3.0'