From 450c047a8812d3d9e772f26a2faeb17acef3e90a Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Thu, 24 Nov 2016 07:07:07 +0000 Subject: 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 --- api/api-prepare.sh | 2 +- tests/ci/yardstick-verify | 2 +- 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} -- cgit