From 4274fb8f03cf3c9b94c5e24a074f65fcf467bd38 Mon Sep 17 00:00:00 2001 From: dongwenjuan Date: Wed, 13 Sep 2017 11:21:38 +0800 Subject: Enable Doctor testcase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It upates upper-constraints.txt and thirdparty-requirements.txt as doctor-test was renamed to doctor-tests. It installs the doctor packages and its requirements via python3. Then python_version>='3.0' conditions are added to avoid installing them for python2. It also calls the new console scripts and modifies the installer list supporting it. Conflicts: upper-constraints.txt Co-Authored-By: Cédric Ollivier Change-Id: Icd855f4534d9d9591165e99aa0eed6b1030018e0 Signed-off-by: dongwenjuan Signed-off-by: Cédric Ollivier (cherry picked from commit 1e1fba3aa18ebcbff6746586654805a44e88e9fe) --- docker/features/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docker/features/Dockerfile') diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index f20c58619..1ff2dc42f 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -6,12 +6,16 @@ ARG OPENSTACK_TAG=stable/ocata COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \ apk --no-cache add --virtual .build-deps --update \ - python-dev build-base linux-headers libffi-dev \ + python-dev python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ pip install --no-cache-dir --src /src \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -rthirdparty-requirements.txt && \ + python3 -m pip install --no-cache-dir --src /src \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + doctor-tests && \ npm -g install npm@latest && \ (cd /src/promise/source && npm install) && \ rm -r thirdparty-requirements.txt && \ -- cgit 1.2.3-korg