summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2016-11-24 07:07:07 +0000
committerJack Chan <chenjiankun1@huawei.com>2016-11-24 07:21:52 +0000
commit450c047a8812d3d9e772f26a2faeb17acef3e90a (patch)
tree9a0e3aab8a2910a37ef6d78aef92c2e1a5f850c3
parentd491d77dea52e459dc6f1e1ec39703e26a4857e7 (diff)
Fix the conflict in yardstick.conf between API and CI
JIRA: YARDSTICK-421 In the Docker image, the default dispatcher value in yardstick.conf is local influxDB. But the CI will set another. It will cause a conflict. So I '>' to cover yardstick.conf file. Change-Id: I7088682e952ee7bb84f6872a49a24296d676a9cb Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
-rwxr-xr-xapi/api-prepare.sh2
-rwxr-xr-xtests/ci/yardstick-verify2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/api-prepare.sh b/api/api-prepare.sh
index 712ad8361..075d7875c 100755
--- a/api/api-prepare.sh
+++ b/api/api-prepare.sh
@@ -9,7 +9,7 @@ if [[ ! -e "${output_config}" ]];then
install -d /etc/yardstick -m 0755 -o root
- cat << EOF >> "${output_config}"
+ cat << EOF > "${output_config}"
[DEFAULT]
debug = True
dispatcher = influxdb
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 2b7ec9d34..1a6682f85 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -160,7 +160,7 @@ run_test()
mkdir -p /etc/yardstick
- cat << EOF >> /etc/yardstick/yardstick.conf
+ cat << EOF > /etc/yardstick/yardstick.conf
[DEFAULT]
debug = True
dispatcher = ${DISPATCHER_TYPE}