summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2017-09-13 11:21:38 +0800
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-20 20:30:04 +0200
commit4274fb8f03cf3c9b94c5e24a074f65fcf467bd38 (patch)
tree632f46efc88607cbecea00f44bb27f891819790e /docker/Dockerfile
parent7683b977ee4b1c88b0876b4a18a1ae76aad6f8ab (diff)
Enable Doctor testcase
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 <cedric.ollivier@orange.com> Change-Id: Icd855f4534d9d9591165e99aa0eed6b1030018e0 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn> Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 1e1fba3aa18ebcbff6746586654805a44e88e9fe)
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5d934dfe9..1a8089b81 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -92,6 +92,10 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
-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 && \
mkdir -p /etc/rally && \
printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \
mkdir -p /var/lib/rally/database && rally-manage db create && \