x/compass-core
Code Issues Proposed changes

Fix a syntax error in prepare.sh

Browse Source 
Change-Id: I609525baf8559252fe534ce6367896d5991f66fc
This commit is contained in:
Xicheng Chang
2015-06-18 17:41:09 -07:00
parent 609db48197
commit 2ffab27b64
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
regtest/ansible/ci/prepare.sh
View File

@@ -33,6 +33,7 @@ if [[ $? != 0 ]]; then
else else
wget ${centos65_box_vb_url} wget ${centos65_box_vb_url}
mv ${centos65_box_vb_filename} centos65.box mv ${centos65_box_vb_filename} centos65.box
fi
vagrant mutate centos65.box libvirt vagrant mutate centos65.box libvirt
else else
echo "centos65 box already exists" echo "centos65 box already exists"

3
regtest/ansible/ci/setup-env.sh
View File

@@ -3,7 +3,8 @@
#cd compass-install #cd compass-install
function join { local IFS="$1"; shift; echo "$*"; } 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 source ${SCRIPT_DIR}/func.sh
if [[ ! -z $VIRT_NUMBER ]]; then if [[ ! -z $VIRT_NUMBER ]]; then
mac_array=$(${SCRIPT_DIR}/mac_generator.sh $VIRT_NUMBER) mac_array=$(${SCRIPT_DIR}/mac_generator.sh $VIRT_NUMBER)