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.

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>

9 files changed, 22 insertions, 10 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 218d7441..3cfcbf4b 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 && \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 8b0a2f60..1ab4142f 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 e8a2095c..dc137429 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 0a9f2a10..618f750b 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
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index 2c756028..450d2ae0 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 0a9f2a10..618f750b 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
diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt
index 741eb8ef..a6354577 100644
--- a/docker/thirdparty-requirements.txt
+++ b/docker/thirdparty-requirements.txt
@@ -2,7 +2,7 @@ baro_tests
 sdnvpn
 sfc
 promise
-doctor-test
+doctor-tests;python_version>='3.0'
 tosca-parser>=0.7.0 # Apache-2.0
 heat-translator>=0.4.0 # Apache-2.0
 refstack-client
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 67ecaf8e..470cdb0f 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -253,20 +253,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/upper-constraints.txt b/upper-constraints.txt
index 3b1e8bd9..3c27d71f 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -4,7 +4,7 @@ git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests
 git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
 git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc
 -e git+https://gerrit.opnfv.org/gerrit/promise#egg=promise
--e git+https://gerrit.opnfv.org/gerrit/doctor#egg=doctor-test
+-e git+https://gerrit.opnfv.org/gerrit/doctor#egg=doctor-tests
 git+https://gerrit.opnfv.org/gerrit/domino#egg=domino
 cloudify-rest-client===4.0
 iniparse===0.4