diff options
| author |   dongwenjuan <dong.wenjuan@zte.com.cn> | 2017-09-13 11:21:38 +0800 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-09-20 20:30:04 +0200 |
| commit | 4274fb8f03cf3c9b94c5e24a074f65fcf467bd38 (patch) | |
| tree | 632f46efc88607cbecea00f44bb27f891819790e /docker/restapi | |
| parent | 7683b977ee4b1c88b0876b4a18a1ae76aad6f8ab (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/restapi')
| -rw-r--r-- | docker/restapi/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/restapi/thirdparty-requirements.txt | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile index 23adcc852..50eb8a890 100644 --- a/docker/restapi/Dockerfile +++ b/docker/restapi/Dockerfile @@ -12,7 +12,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \ procps libxslt libxml2 zlib libffi && \ 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 \ ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \ @@ -22,6 +22,10 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \ -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 \ -e/src/refstack-client -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 && \ git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd src/odl_test && git checkout -b $ODL_TAG) && \ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \ diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt index 0a9f2a101..618f750be 100644 --- a/docker/restapi/thirdparty-requirements.txt +++ b/docker/restapi/thirdparty-requirements.txt @@ -2,4 +2,5 @@ baro_tests sdnvpn sfc promise +doctor-tests;python_version>='3.0' domino |