summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2018-07-31 14:26:51 +0800
committerdongwenjuan <dong.wenjuan@zte.com.cn>2018-07-31 14:26:51 +0800
commitaf9396beb5d068cd3b2a1a74c97287b8f0760644 (patch)
tree802b08d17efb85f5585f4c3ae628c4df5c69f2da /jjb
parent0e0e0d4cb71fb27b1789a2bef2d3c4ff313e67ff (diff)
bugfix: wrong usage of '!include-raw'
Change-Id: Ibbc1363bf5260301b33afad84244aa1d7af4ffce Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/doctor/doctor.yaml12
1 files changed, 10 insertions, 2 deletions
diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 566625edd..66b7382f2 100644
--- 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