From 2ffab27b64dcde5c49fcebe4c6ac78a9f63db9d1 Mon Sep 17 00:00:00 2001 From: Xicheng Chang Date: Thu, 18 Jun 2015 17:41:09 -0700 Subject: [PATCH] Fix a syntax error in prepare.sh Change-Id: I609525baf8559252fe534ce6367896d5991f66fc --- regtest/ansible/ci/prepare.sh | 1 + regtest/ansible/ci/setup-env.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/regtest/ansible/ci/prepare.sh b/regtest/ansible/ci/prepare.sh index cb247618..4d5f990c 100644 --- a/regtest/ansible/ci/prepare.sh +++ b/regtest/ansible/ci/prepare.sh @@ -33,6 +33,7 @@ if [[ $? != 0 ]]; then else wget ${centos65_box_vb_url} mv ${centos65_box_vb_filename} centos65.box + fi vagrant mutate centos65.box libvirt else echo "centos65 box already exists" diff --git a/regtest/ansible/ci/setup-env.sh b/regtest/ansible/ci/setup-env.sh index bd86caa0..7df8cf8a 100644 --- a/regtest/ansible/ci/setup-env.sh +++ b/regtest/ansible/ci/setup-env.sh @@ -3,7 +3,8 @@ #cd compass-install function join { local IFS="$1"; shift; echo "$*"; } -source ${SCRIPT_DIR}/conf/one.conf +REGTEST_CONF=${REGTEST_CONF:-"allinone.conf"} +source ${SCRIPT_DIR}/conf/${REGTEST_CONF} source ${SCRIPT_DIR}/func.sh if [[ ! -z $VIRT_NUMBER ]]; then mac_array=$(${SCRIPT_DIR}/mac_generator.sh $VIRT_NUMBER)