X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdoctor%2Fdoctor.yml;h=3985356c1f1fba4d4af4b3f04a43a4d5eaea611f;hb=53901176ad412b96e16b7a6d68ce23c91caa37a0;hp=c3760a739cccdde1ba69c782b33cfe67cac65681;hpb=b73e1c1f2058f6b80202d7d1a75b229c02ea858f;p=releng.git

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index c3760a739..3985356c1 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -16,10 +16,15 @@
           docker-tag: 'stable'
           disabled: false
 
+    # feature projects' tests are not triggered by functest
+    # doctor verify Pods need to deploy with these scenario
     installer:
-      - 'apex'
-      - 'fuel'
-      - 'daisy'
+      - 'apex':
+          scenario: 'os-nosdn-kvm-ha'
+      - 'fuel':
+          scenario: 'os-nosdn-ovs-ha'
+      - 'daisy':
+          scenario: 'os-nosdn-ovs_dpdk-noha'
 
     arch:
       - 'x86_64'
@@ -63,7 +68,7 @@
          # in phase jobs
          echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-verify-apex-inspector'
+          name: 'doctor-verify'
           execution-type: PARALLEL
           projects:
             - name: 'doctor-verify-apex-{inspector}-x86_64-{stream}'
@@ -74,12 +79,7 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-fuel-inspector'
-          execution-type: PARALLEL
-          projects:
             - name: 'doctor-verify-fuel-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
@@ -88,12 +88,7 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-fuel-inspector'
-          execution-type: PARALLEL
-          projects:
             - name: 'doctor-verify-fuel-{inspector}-aarch64-{stream}'
               predefined-parameters: |
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -101,12 +96,7 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-daisy-inspector'
-          execution-type: PARALLEL
-          projects:
             - name: 'doctor-verify-daisy-{inspector}-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
@@ -115,7 +105,6 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
-              current-parameters: true
               git-revision: true
 
 - job-template:
@@ -132,7 +121,9 @@
           branch: '{branch}'
       - '{installer}-defaults'
       - 'doctor-slave-parameter'
-      - 'doctor-parameter'
+      - 'doctor-parameter':
+          docker-tag: '{docker-tag}'
+          scenario: '{scenario}'
       - 'doctor-functest-parameter'
     scm:
       - git-scm-gerrit
@@ -162,7 +153,7 @@
           description: 'Remove downloaded docker images (opnfv/functest:*)'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
+          default: '{scenario}'
           description: 'Scenario to deploy and test'
 
 - parameter: