summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/features/Dockerfile2
-rw-r--r--docker/features/thirdparty-requirements.txt12
2 files changed, 7 insertions, 7 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index b2f2ea817..e59c96b7e 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -30,7 +30,7 @@ RUN apk --no-cache add --update python3 sshpass && \
git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- doctor-tests && \
+ -rthirdparty-requirements.txt && \
rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git \
/src/os-faults /src/rally && \
mkdir -p /etc/rally && \
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index 73c11b447..f20f69cc2 100644
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -1,7 +1,7 @@
-robotframework-httplibrary
-robotframework-requests
-robotframework-sshlibrary;python_version=='2.7'
-baro_tests
-sdnvpn
-sfc
+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'
doctor-tests;python_version>='3.0'