x
/
fuel-plugin-vmware-dvs
Code Issues Proposed changes

Fix shellschek failures 

Change-Id: I5e33c5ec8df6d66982b132b06ed0016fe6f9608e
This commit is contained in:
Vasily Gorin 2016-05-25 11:05:22 +00:00
parent 2ab13845b0
commit f25adfef83
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugin_test/utils/jenkins/system_tests.sh
View File

@ -320,7 +320,7 @@ MakeISO() {
if [ "${DRY_RUN}" = "yes" ]; then
ISO="${WORKSPACE}/build/iso/fuel.iso"
else
ISO="`ls ${WORKSPACE}/build/iso/*.iso | head -n 1`"
ISO="$(find ${WORKSPACE}/build/iso/*.iso | head -n 1)"
# check that ISO file exists
if [ ! -f "${ISO}" ]; then
echo "Error! ISO file not found!"
@ -454,7 +454,7 @@ RunTest() {
if [ "${DRY_RUN}" = "yes" ]; then
echo dos.py erase "${ENV_NAME}"
else
if [ $(dos.py list | grep "^${ENV_NAME}\$") ]; then
if dos.py list | grep -q "^${ENV_NAME}\$" ; then
dos.py erase "${ENV_NAME}"
fi
fi
@ -493,7 +493,7 @@ RunTest() {
fi
#Wait before environment is created
while [ $(virsh net-list |grep $ENV_NAME |wc -l) -ne 5 ];do sleep 10
while [ $(virsh net-list |grep -c $ENV_NAME) -ne 5 ];do sleep 10
if ! ps -p $SYSTEST_PID > /dev/null
then
echo System tests exited prematurely, aborting
@ -558,7 +558,7 @@ add_interface_to_bridge() {
ip=$4
for net in $(virsh net-list |grep ${env}_${net_name} |awk '{print $1}');do
bridge=`virsh net-info $net |grep -i bridge |awk '{print $2}'`
bridge=$(virsh net-info $net |grep -i bridge |awk '{print $2}')
setup_bridge $bridge $nic $ip && echo $net_name bridge $bridge ready
done
}
@ -571,7 +571,7 @@ setup_bridge() {
sudo /sbin/brctl stp $bridge off
sudo /sbin/brctl addif $bridge $nic
#set if with existing ip down
for itf in `sudo ip -o addr show to $ip |cut -d' ' -f2`; do
for itf in $(sudo ip -o addr show to $ip |cut -d' ' -f2); do
echo deleting $ip from $itf
sudo ip addr del dev $itf $ip
done
@ -587,7 +587,7 @@ setup_bridge() {
clean_old_bridges() {
for intf in $WORKSTATION_IFS; do
for br in `/sbin/brctl show | grep -v "bridge name" | cut -f1 -d' '`; do
for br in $(/sbin/brctl show | grep -v "bridge name" | cut -f1 -d' '); do
/sbin/brctl show $br| grep -q $intf && sudo /sbin/brctl delif $br $intf \
&& sudo /sbin/ip link set dev $br down && echo $intf deleted from $br
done
@ -620,7 +620,7 @@ setup_net() {
# MAIN
# first we want to get variable from command line options
GetoptsVariables ${@}
GetoptsVariables "${@}"
# then we define global variables and there defaults when needed
GlobalVariables