diff options
| author |   dongwenjuan <dong.wenjuan@zte.com.cn> | 2018-07-31 14:43:02 +0800 |
|---|---|---|
| committer | dongwenjuan <dong.wenjuan@zte.com.cn> | 2018-07-31 15:21:56 +0800 |
| commit | ef4f36aa1c2ff0819d73cde44f84b99a42e15c7e (patch) | |
| tree | 8a7071b27190cc619c311180a57c433cf679dbe8 /jjb | |
| parent | af9396beb5d068cd3b2a1a74c97287b8f0760644 (diff) | |
bugfix: wrong usage of '!include-raw'
JIRA: DOCTOR-126
Change-Id: Iabcd8a8ad14079e2ba7e72e39e009a0ee833cb3c
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/doctor/doctor-env-presetup.sh | 6 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yaml | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/jjb/doctor/doctor-env-presetup.sh b/jjb/doctor/doctor-env-presetup.sh index b80b711a3..2dda71f3c 100755 --- a/jjb/doctor/doctor-env-presetup.sh +++ b/jjb/doctor/doctor-env-presetup.sh @@ -35,11 +35,5 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then echo "No available installer VM exists...exiting" exit 1 fi - -elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then - if [[ ! "${BRANCH}" =~ "danube" ]]; then - echo "Map mcp ssh_key" - export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa" - fi fi diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index 66b7382f2..25ea0ae9c 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -123,9 +123,7 @@ 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' @@ -148,8 +146,9 @@ - builder: name: 'doctor-verify-installer-inspector-builders-macro' builders: + # yamllint disable rule:indentation - 'clean-workspace-log' - - shell: | + - shell: !include-raw: - ./doctor-env-presetup.sh - ../../utils/fetch_os_creds.sh |