diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-10-06 11:08:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-06 11:08:23 +0000 |
| commit | d0d471502ff7b5dfabf4a2ede79782c5708a463c (patch) | |
| tree | 571034f6643364657c86c05cbf7d55fde6525bde | |
| parent | 427547d5680878dabfa1e8d1e53fdb2921fd01ab (diff) | |
| parent | 01509097c7447ee70d61f7e97d7947b127425eac (diff) | |
Merge "Read thirdparty-requirements.txt if py3"
| -rw-r--r-- | docker/features/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 01e0cb2bb..a5a1b9807 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 e9b16b933..672fb24fd 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' |