Fix shellcheck lint errors in test/kubemark/iks/shutdown.sh

This commit is contained in:
Bob Killen 2019-02-04 17:40:52 -06:00
parent 186b83fe5b
commit 6310305d3b
No known key found for this signature in database
GPG Key ID: 03FB8A8615239E6D
2 changed files with 4 additions and 3 deletions

View File

@ -145,7 +145,6 @@
./test/images/volume/rbd/create_block.sh
./test/images/volume/rbd/mon.sh
./test/images/volume/rbd/osd.sh
./test/kubemark/iks/shutdown.sh
./test/kubemark/iks/startup.sh
./test/kubemark/iks/util.sh
./test/kubemark/master-log-dump.sh

View File

@ -24,6 +24,7 @@ RESOURCE_DIRECTORY="${KUBEMARK_DIRECTORY}/resources"
complete-login
# Remove resources created for kubemark
# shellcheck disable=SC2154 # Color defined in sourced script
echo -e "${color_yellow}REMOVING RESOURCES${color_norm}"
spawn-config
"${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/addons" &> /dev/null || true
@ -35,8 +36,9 @@ rm -rf "${RESOURCE_DIRECTORY}/addons"
# Remove clusters, namespaces, and deployments
delete-clusters
if [[ -f "${RESOURCE_DIRECTORY}/iks-namespacelist.sh" ]] ; then
bash ${RESOURCE_DIRECTORY}/iks-namespacelist.sh
rm -f ${RESOURCE_DIRECTORY}/iks-namespacelist.sh
bash "${RESOURCE_DIRECTORY}/iks-namespacelist.sh"
rm -f "${RESOURCE_DIRECTORY}/iks-namespacelist.sh"
fi
# shellcheck disable=SC2154 # Color defined in sourced script
echo -e "${color_blue}EXECUTION COMPLETE${color_norm}"
exit 0