Skip to content

Commit dcc188f

Browse files
committed
Style fixes in bash files. No functional changes
Signed-off-by: Natanael Copa <[email protected]>
1 parent 5fcdf83 commit dcc188f

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

tests/shared.bash

+15-12
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,33 @@ logline() {
77
}
88

99
_setup() {
10-
export name=$(basename ${0%.bash})
11-
export footlooseconfig=footloose-$name.yaml
10+
export name=$(basename ${0%.bash})
11+
export footlooseconfig=footloose-$name.yaml
1212

1313
echo "==> SETUP"
1414
logline "creating footloose config ..."
15-
CLUSTER_NAME=$name \
16-
LINUX_IMAGE=quay.io/footloose/ubuntu18.04 \
17-
MKE_BINARY=${MKE_BINARY:-$(readlink -f ../mke)} \
18-
envsubst < ${footlooseconfig}.tpl > $footlooseconfig
15+
CLUSTER_NAME=$name \
16+
LINUX_IMAGE=quay.io/footloose/ubuntu18.04 \
17+
MKE_BINARY=${MKE_BINARY:-$(readlink -f ../mke)} \
18+
envsubst < ${footlooseconfig}.tpl > $footlooseconfig
19+
20+
logline "starting to create footloose nodes ..."
21+
>/dev/null 2>&1 ./bin/footloose create --config $footlooseconfig
1922

20-
logline "starting to create footloose nodes ..."
21-
>/dev/null 2>&1 ./bin/footloose create --config $footlooseconfig
2223
logline "create mke groups on nodes ..."
23-
>/dev/null 2>&1 ./bin/footloose ssh --config $footlooseconfig root@node0 "addgroup --system mke"
24+
>/dev/null 2>&1 ./bin/footloose ssh --config $footlooseconfig root@node0 "addgroup --system mke"
2425
>/dev/null 2>&1 ./bin/footloose ssh --config $footlooseconfig root@node1 "addgroup --system mke"
2526
}
2627

2728
_cleanup() {
2829
echo ""
2930
echo "==> CLEANUP"
3031
set +e
32+
3133
logline "cleaning up footloose cluster"
32-
>/dev/null 2>&1 ./bin/footloose delete --config $footlooseconfig
33-
>/dev/null 2>&1 rm -f $footlooseconfig
34+
>/dev/null 2>&1 ./bin/footloose delete --config $footlooseconfig
35+
>/dev/null 2>&1 rm -f $footlooseconfig
36+
3437
logline "pruning docker volumes"
35-
>/dev/null 2>&1 docker volume prune -f
38+
>/dev/null 2>&1 docker volume prune -f
3639
}

tests/sig-network.bash

+6-5
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ export KUBECONFIG=./kubeconfig
4545
exec ./bin/sonobuoy logs -f
4646
)& 2>&1 | sed -le "s#^#sonobuoy:logs: #;"
4747
logs_pid=$!
48+
4849
logline "run sonobuoy:"
4950
set +e
50-
./bin/sonobuoy run --wait=60 --plugin-env=e2e.E2E_USE_GO_RUNNER=true '--e2e-focus=\[sig-network\].*\[Conformance\]' '--e2e-skip=\[Serial\]' --e2e-parallel=y
51-
result=$?
52-
echo $result
53-
kill $logs_pid
54-
wait $logs_pid
51+
./bin/sonobuoy run --wait=60 --plugin-env=e2e.E2E_USE_GO_RUNNER=true '--e2e-focus=\[sig-network\].*\[Conformance\]' '--e2e-skip=\[Serial\]' --e2e-parallel=y
52+
result=$?
53+
echo $result
54+
kill $logs_pid
55+
wait $logs_pid
5556
set -e
5657
if [ "${result}" = "0" ]; then
5758
title "sonobuoy[sig-network]: SUCCESS!!!"

0 commit comments

Comments
 (0)