Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug-fix: Add compass pod yaml in btks config dir
[releng.git]
/
jjb
/
bottlenecks
/
bottlenecks-run-suite.sh
diff --git
a/jjb/bottlenecks/bottlenecks-run-suite.sh
b/jjb/bottlenecks/bottlenecks-run-suite.sh
index
341aab5
..
940db94
100644
(file)
--- 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}
[ -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
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
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"
-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
deactivate