From: Serena Feng <feng.xiaowei@zte.com.cn>
Date: Tue, 18 Dec 2018 01:08:43 +0000 (+0000)
Subject: Merge "Add parameter of `DEPLOY_SCENARIO` for doctor"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cf9cc976185da259eca1b3e8722b75a9855e8f8c;hp=a87d08f26c1a8f2b99e03dc3b0654fb3e9796382;p=releng.git

Merge "Add parameter of `DEPLOY_SCENARIO` for doctor"
---

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index deccc32a4..71c519856 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -21,8 +21,10 @@
           disabled: false
 
     installer:
-      - 'apex'
-      - 'fuel'
+      - 'apex':
+          scenario: 'os-nosdn-nofeature-noha'
+      - 'fuel':
+          scenario: 'os-nosdn-nofeature-noha'
 
     arch:
       - 'x86_64'
@@ -117,6 +119,7 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'fault_management'
     scm:
       - git-scm-gerrit
@@ -141,6 +144,7 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'maintenance'
     scm:
       - git-scm-gerrit
@@ -165,6 +169,7 @@
       - 'doctor-slave-parameter'
       - 'doctor-parameter':
           inspector: '{inspector}'
+          scenario: '{scenario}'
           test_case: 'all'
     scm:
       - git-scm-gerrit
@@ -188,6 +193,10 @@
           name: TEST_CASE
           default: '{test_case}'
           description: 'test case: all, fault_management or maintenance'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+          description: 'Scenario to deploy and test'
 
 
 # -------------------------------