From 0bed33a29da92685dc208b5929de6aefe0c5e5e9 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 4 Jul 2018 15:20:22 +0200 Subject: Install Robot dependencies in healthcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit old testcase moved to opnfv/functest-healthcheck. Change-Id: If8e8fc7d8bc9c97602c05e5a4c048461351cc97e Signed-off-by: Cédric Ollivier --- docker/smoke/Dockerfile | 5 ++--- docker/smoke/thirdparty-requirements.txt | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 docker/smoke/thirdparty-requirements.txt (limited to 'docker/smoke') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 076b1a98c..87b28f0a4 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -5,7 +5,6 @@ ARG OPENSTACK_TAG=stable/queens ARG REFSTACK_TARGET=2017.09 ARG PATROLE_TAG=0.3.0 -COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ @@ -22,9 +21,9 @@ RUN apk --no-cache add --virtual .build-deps --update \ git clone --depth 1 https://github.com/openstack/barbican-tempest-plugin.git /src/barbican-tempest-plugin && \ update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \ diff --git a/docker/smoke/thirdparty-requirements.txt b/docker/smoke/thirdparty-requirements.txt deleted file mode 100644 index 6d7ee1226..000000000 --- a/docker/smoke/thirdparty-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -robotframework-httplibrary -robotframework-requests -robotframework-sshlibrary;python_version=='2.7' -- cgit