diff options
| author |   mei mei <meimei@huawei.com> | 2018-03-22 02:21:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-22 02:21:26 +0000 |
| commit | b641622c5f67ac7c139f15efbbee4783c5dafba2 (patch) | |
| tree | 32f80a1d08f0f2ff677e8c3e57c6e560fdb4223f /jjb | |
| parent | e2873903c578d135a360aa7639de6654958c7ac4 (diff) | |
| parent | 4060688edd500c75a17e5c4a981d8cd3aba6321f (diff) | |
Merge "Fetch creds according scenario type(os or k8)"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yml | 28 | ||||
| -rwxr-xr-x | jjb/yardstick/yardstick-get-k8s-conf.sh | 1 |
2 files changed, 18 insertions, 11 deletions
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml index 20890fa13..24c7f319b 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yml +++ b/jjb/yardstick/yardstick-daily-jobs.yml @@ -262,8 +262,7 @@ - description-setter: description: "POD: $NODE_NAME" - 'yardstick-cleanup' - - 'yardstick-fetch-os-creds' - - 'yardstick-fetch-k8s-conf' + - 'yardstick-fetch-creds' - 'yardstick-{testsuite}' - 'yardstick-store-results' @@ -282,16 +281,23 @@ !include-raw: ./yardstick-daily.sh - builder: - name: yardstick-fetch-os-creds + name: yardstick-fetch-creds builders: - - shell: - !include-raw: ../../utils/fetch_os_creds.sh - -- builder: - name: yardstick-fetch-k8s-conf - builders: - - shell: - !include-raw: ./yardstick-get-k8s-conf.sh + # yamllint disable rule:indentation + - conditional-step: + condition-kind: regex-match + regex: "os-.*" + label: '$DEPLOY_SCENARIO' + steps: + - shell: + !include-raw: ../../utils/fetch_os_creds.sh + - conditional-step: + condition-kind: regex-match + regex: "k8-.*" + label: '$DEPLOY_SCENARIO' + steps: + - shell: + !include-raw: ./yardstick-get-k8s-conf.sh - builder: name: yardstick-store-results diff --git a/jjb/yardstick/yardstick-get-k8s-conf.sh b/jjb/yardstick/yardstick-get-k8s-conf.sh index 22a6aa4e6..116d2f0d0 100755 --- a/jjb/yardstick/yardstick-get-k8s-conf.sh +++ b/jjb/yardstick/yardstick-get-k8s-conf.sh @@ -7,6 +7,7 @@ if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then if [[ ${INSTALLER_TYPE} == 'joid' ]];then juju scp kubernetes-master/0:config "${dest_path}" elif [[ ${INSTALLER_TYPE} == 'compass' ]];then + echo "Copy admin.conf to ${dest_path}" docker cp compass-tasks:/opt/admin.conf "${dest_path}" fi fi |