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)