bugfix: wrong usage of '!include-raw'

Change-Id: Ibbc1363bf5260301b33afad84244aa1d7af4ffce
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 566625e..66b7382 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -118,6 +118,8 @@
           branch: '{branch}'
       - '{installer}-defaults'
       - 'doctor-slave-parameter'
+      - 'doctor-parameter':
+          inspector: '{inspector}'
     scm:
       - git-scm-gerrit
     builders:
@@ -131,6 +133,13 @@
 # -------------------------------
 # parameter macros
 # -------------------------------
+- parameter:
+    name: 'doctor-parameter'
+    parameters:
+      - string:
+          name: INSPECTOR_TYPE
+          default: '{inspector}'
+          description: 'inspector component'
 
 # -------------------------------
 # builder macros
@@ -141,11 +150,10 @@
     builders:
       - 'clean-workspace-log'
       - shell: |
-          export INSTALLER_TYPE={installer}
-          export INSPECTOR_TYPE={inspector}
           !include-raw:
               - ./doctor-env-presetup.sh
               - ../../utils/fetch_os_creds.sh
+      - shell: |
           source $HOME/opnfv-openrc.sh
           source $HOME/os_cacert
           tox -e py35