From 5400c8133810b7538f26b83b30e9ab5be29f79c6 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 6 Oct 2018 11:37:26 +0200 Subject: Read thirdparty-requirements.txt if py3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 01509097c7447ee70d61f7e97d7947b127425eac) --- docker/features/Dockerfile | 2 +- docker/features/thirdparty-requirements.txt | 12 ++++++------ 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' -- cgit 1.2.3-korg