X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=f93ac9bef9a8233b3f28ae50b2e2c8b79a1dc888;hb=489cd0fd7e6eed490bca2d50eb7706d89284a2c0;hp=fcbd1b0e7530b4758d7e72bbb7612bc4ac19f84e;hpb=82d58651bbf7a2bd5ee0a74bf767be71c27a8eef;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index fcbd1b0e7..f93ac9bef 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -18,14 +18,11 @@
     installer:
         - apex:
             slave-label: 'ool-virtual1'
-
-    inspector:
-        - sample
-        - congress
+            pod: 'ool-virtual1'
 
     jobs:
         - 'doctor-verify-{stream}'
-        - 'doctor-verify-{installer}-{inspector}-{stream}'
+        - 'doctor-verify-{installer}-{stream}'
 
 - job-template:
     name: 'doctor-verify-{stream}'
@@ -71,21 +68,20 @@
         - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
 
 - job-template:
-    name: 'doctor-verify-{installer}-{inspector}-{stream}'
+    name: 'doctor-verify-{installer}-{stream}'
+
+    node: '{slave-label}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - string:
-            name: INSPECTOR_TYPE
-            default: '{inspector}'
-            description: 'Doctor inspector type to be used'
         - string:
             name: OS_CREDS
             default: /home/jenkins/openstack.creds
             description: 'OpenStack credentials'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -122,10 +118,27 @@
 
     builders:
         - trigger-builds:
-          - project: 'functest-{installer}-virtual-suite-{stream}'
+          - project: 'functest-{installer}-{pod}-suite-{stream}'
+            current-parameters: true
+            predefined-parameters: |
+              CI_DEBUG=true
+              FUNCTEST_SUITE_NAME=doctor
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              TESTCASE_OPTIONS=-e INSPECTOR_TYPE=sample -v $WORKSPACE:$HOME/opnfv/repos/doctor
+            block: true
+            same-node: true
+          - project: 'functest-{installer}-{pod}-suite-{stream}'
             current-parameters: true
             predefined-parameters: |
+              CI_DEBUG=true
               FUNCTEST_SUITE_NAME=doctor
-              TESTCASE_OPTIONS='-e INSPECTOR_TYPE=$INSPECTOR_TYPE -v $WORKSPACE:$HOME/opnfv/repos/doctor'
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              TESTCASE_OPTIONS=-e INSPECTOR_TYPE=congress -v $WORKSPACE:$HOME/opnfv/repos/doctor
             block: true
             same-node: true
+        - shell: |
+            logfile=$HOME/opnfv/functest/results/{stream}/doctor.log
+            echo
+            echo "[$logfile]"
+            echo
+            [ -e $logfile ] && cat $logfile