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/features | |
| 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/features')
| -rw-r--r-- | docker/features/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/features/testcases.yaml | 5 | ||||
| -rw-r--r-- | docker/features/thirdparty-requirements.txt | 1 |
3 files changed, 8 insertions, 4 deletions
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 && \ diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index e8a2095c5..dc137429b 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -25,20 +25,19 @@ tiers: - case_name: doctor-notification - enabled: false project_name: doctor criteria: 100 blocking: false description: >- Test suite from Doctor project. dependencies: - installer: '(apex)|(fuel)' + installer: 'apex' scenario: '^((?!fdio).)*$' run: module: 'functest.core.feature' class: 'BashFeature' args: - cmd: '(cd /src/doctor-test/tests && run.sh)' + cmd: 'doctor-test' - case_name: bgpvpn diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt index 0a9f2a101..618f750be 100644 --- a/docker/features/thirdparty-requirements.txt +++ b/docker/features/thirdparty-requirements.txt @@ -2,4 +2,5 @@ baro_tests sdnvpn sfc promise +doctor-tests;python_version>='3.0' domino |