summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/features/Dockerfile5
-rw-r--r--docker/features/thirdparty-requirements.txt14
2 files changed, 10 insertions, 9 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 08c5700a4..292ebe696 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 795827076..f349627dd 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'