bugfix: wrong usage of '!include-raw'

[releng.git] / jjb / doctor / doctor.yaml

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 566625e..25ea0ae 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -118,12 +118,12 @@
           branch: '{branch}'
       - '{installer}-defaults'
       - 'doctor-slave-parameter'
+      - 'doctor-parameter':
+          inspector: '{inspector}'
     scm:
       - git-scm-gerrit
     builders:
-      - doctor-verify-installer-inspector-builders-macro:
-          installer: '{installer}'
-          inspector: '{inspector}'
+      - 'doctor-verify-installer-inspector-builders-macro'
     publishers:
       - 'doctor-verify-publishers-macro'
 
@@ -131,6 +131,13 @@
 # -------------------------------
 # parameter macros
 # -------------------------------
+- parameter:
+    name: 'doctor-parameter'
+    parameters:
+      - string:
+          name: INSPECTOR_TYPE
+          default: '{inspector}'
+          description: 'inspector component'
 
 # -------------------------------
 # builder macros
@@ -139,13 +146,13 @@
 - builder:
     name: 'doctor-verify-installer-inspector-builders-macro'
     builders:
+      # yamllint disable rule:indentation
       - 'clean-workspace-log'
-      - shell: |
-          export INSTALLER_TYPE={installer}
-          export INSPECTOR_TYPE={inspector}
+      - shell:
           !include-raw:
               - ./doctor-env-presetup.sh
               - ../../utils/fetch_os_creds.sh
+      - shell: |
           source $HOME/opnfv-openrc.sh
           source $HOME/os_cacert
           tox -e py35