Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
This patch includes scripts to create multiple yaml file for different
[kvmfornfv.git]
/
ci
/
envs
/
cyclictest.sh
diff --git
a/ci/envs/cyclictest.sh
b/ci/envs/cyclictest.sh
index
c5b980d
..
920a46b
100755
(executable)
--- a/
ci/envs/cyclictest.sh
+++ b/
ci/envs/cyclictest.sh
@@
-7,9
+7,10
@@
source utils.sh
testType=$1 #daily/verify/merge
source utils.sh
testType=$1 #daily/verify/merge
+testName=$2 #idle_idle/stress_idle
HOST_IP=$( getHostIP )
pod_config='/opt/scripts/pod.yaml'
HOST_IP=$( getHostIP )
pod_config='/opt/scripts/pod.yaml'
-cyclictest_context_file='/opt/
cyclictest-node-context
.yaml'
+cyclictest_context_file='/opt/
kvmfornfv_cyclictest_'${testName}'
.yaml'
if [ ! -f ${pod_config} ] ; then
echo "file ${pod_config} not found"
if [ ! -f ${pod_config} ] ; then
echo "file ${pod_config} not found"
@@
-30,7
+31,7
@@
function updateConfDaily() {
DISPATCHER_TYPE=influxdb
DISPATCHER_FILE_NAME="/tmp/yardstick.out"
# Use the influxDB on the jumping server
DISPATCHER_TYPE=influxdb
DISPATCHER_FILE_NAME="/tmp/yardstick.out"
# Use the influxDB on the jumping server
- DISPATCHER_INFLUXDB_TARGET="http://10
.2.117.21
:8086"
+ DISPATCHER_INFLUXDB_TARGET="http://10
4.197.68.199
:8086"
mkdir -p /etc/yardstick
cat << EOF > /etc/yardstick/yardstick.conf
[DEFAULT]
mkdir -p /etc/yardstick
cat << EOF > /etc/yardstick/yardstick.conf
[DEFAULT]
@@
-43,8
+44,8
@@
file_name = ${DISPATCHER_FILE_NAME}
[dispatcher_influxdb]
timeout = 5
db_name = yardstick
[dispatcher_influxdb]
timeout = 5
db_name = yardstick
-username =
root
-password =
root
+username =
opnfv
+password =
0pnfv2015
target = ${DISPATCHER_INFLUXDB_TARGET}
EOF
}
target = ${DISPATCHER_INFLUXDB_TARGET}
EOF
}