From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Fri, 13 Apr 2018 06:15:27 +0000 (+0000)
Subject: Merge "bugfix: run doctor tests parallelly"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=859c955553ac60a7fcd1af12e72031db20bbaf6a;hp=-c;p=releng.git

Merge "bugfix: run doctor tests parallelly"
---

859c955553ac60a7fcd1af12e72031db20bbaf6a
diff --combined jjb/doctor/doctor.yml
index 786db208f,7a82b5d49..5732100be
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@@ -16,15 -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'
@@@ -68,7 -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}'
@@@ -79,12 -74,7 +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
@@@ -93,12 -83,7 +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
@@@ -106,12 -91,7 +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
@@@ -120,7 -100,6 +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:
@@@ -167,7 -146,7 +151,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: