bin/check.sh: fix skip creation option

vseva/base_dirs
Victor Seva 13 years ago
parent 0076efe539
commit e091e7d0b7

@ -358,26 +358,26 @@ if [ -z $SKIP ]; then
create_voip ${DOMAIN} create_voip ${DOMAIN}
echo "$(date) - Adding prefs" echo "$(date) - Adding prefs"
create_voip_prefs create_voip_prefs
fi
if [ -z $SKIP_RUNSIPP ]; then if [ -z $SKIP_RUNSIPP ]; then
echo "$(date) - Cleaning csv/reg.xml files" echo "$(date) - Cleaning csv/reg.xml files"
find ${SCEN_CHECK_DIR} -name 'sipp_scenario_responder*_reg.xml' -exec rm {} \; find ${SCEN_CHECK_DIR} -name 'sipp_scenario_responder*_reg.xml' -exec rm {} \;
find ${SCEN_CHECK_DIR} -name '*.csv' -exec rm {} \; find ${SCEN_CHECK_DIR} -name '*.csv' -exec rm {} \;
echo "$(date) - Generating csv/reg.xml files" echo "$(date) - Generating csv/reg.xml files"
${BIN_DIR}/scenario.pl ${SCEN_CHECK_DIR}/scenario.yml ${BIN_DIR}/scenario.pl ${SCEN_CHECK_DIR}/scenario.yml
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
error_helper "Error creating csv files" 4 error_helper "Error creating csv files" 4
fi
echo "$(date) - Running sipp scenarios"
run_sipp
echo "$(date) - Done sipp"
fi fi
echo "$(date) - Running sipp scenarios"
run_sipp
echo "$(date) - Done sipp"
fi
if [ -z ${SKIP_DELDOMAIN} ]; then if [ -z ${SKIP_DELDOMAIN} ]; then
echo "$(date) - Deleting domain:${DOMAIN}" echo "$(date) - Deleting domain:${DOMAIN}"
delete_voip ${DOMAIN} delete_voip ${DOMAIN}
echo "$(date) - Done" echo "$(date) - Done"
fi
fi fi
if [ -z ${SKIP_PARSE} ]; then if [ -z ${SKIP_PARSE} ]; then

@ -42,7 +42,7 @@ echo "$(date) - Clean result dir"
rm -rf ${RESULT_DIR} rm -rf ${RESULT_DIR}
find ${BASE_DIR}/scenarios/ -depth -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | grep -v templates| sort \ find ${BASE_DIR}/scenarios/ -depth -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | grep -v templates| sort \
| parallel "${BIN_DIR}/check.sh ${GRAPH} -C -d ${DOMAIN} -p ${PROFILE}" | parallel "${BIN_DIR}/check.sh ${GRAPH} -C -R -d ${DOMAIN} -p ${PROFILE}"
status=$? status=$?
echo "$(date) - All done[$status]" echo "$(date) - All done[$status]"
exit $status exit $status

Loading…
Cancel
Save