diff options
| author |   Yang Yu <Gabriel.yuyang@huawei.com> | 2017-08-25 14:24:07 +0800 |
|---|---|---|
| committer | Yang Yu <Gabriel.yuyang@huawei.com> | 2017-08-25 15:14:13 +0800 |
| commit | 89fb4abd40779029db054ad05185193e448e0547 (patch) | |
| tree | 538eb75629cc9d0818908b9cee05820f653ab054 /jjb/bottlenecks | |
| parent | 8400f035b9b2460535080722f2cd1b859a35d65b (diff) | |
Bug-fix: Add compass pod yaml in btks config dir
JIRA: BOTTLENECK-178
Containerized compass does not support ssh method to get the POD
yaml anymore. This patch is to fix the issue.
Change-Id: I98ca9a419d71d0ec22bf48ef40d4c5fb2d96d1b2
Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com>
Diffstat (limited to 'jjb/bottlenecks')
| -rw-r--r-- | jjb/bottlenecks/bottlenecks-run-suite.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh index 341aab590..940db94d1 100644 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ b/jjb/bottlenecks/bottlenecks-run-suite.sh @@ -16,6 +16,10 @@ RELENG_REPO=${WORKSPACE}/releng [ -d ${RELENG_REPO} ] && rm -rf ${RELENG_REPO} git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO} >${redirect} +YARDSTICK_REPO=${WORKSPACE}/yardstick +[ -d ${YARDSTICK_REPO} ] && rm -rf ${YARDSTICK_REPO} +git clone https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO} >${redirect} + OPENRC=/tmp/admin_rc.sh OS_CACERT=/tmp/os_cacert @@ -85,11 +89,18 @@ if [[ $SUITE_NAME == *posca* ]]; then echo "Don't support to generate pod.yaml on ${INSTALLER_TYPE} currently." fi - cmd="sudo python ${RELENG_REPO}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \ + if [[ ${INSTALLER_TYPE} != compass]]; then + cmd="sudo python ${RELENG_REPO}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \ -i ${INSTALLER_IP} ${options} -f ${BOTTLENECKS_CONFIG}/pod.yaml \ -s ${BOTTLENECKS_CONFIG}/id_rsa" - echo ${cmd} - ${cmd} + echo ${cmd} + ${cmd} + else + cmd="sudo cp ${YARDSTICK_REPO}/etc/yardstick/nodes/compass_sclab_virtual/pod.yaml \ + ${BOTTLENECKS_CONFIG}" + echo ${cmd} + ${cmd} + fi deactivate |