From 1736af502407bd12c22bc55da19beb0bc4cabf2a Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Fri, 19 May 2017 18:08:50 -0700 Subject: [PATCH] tests/smoke: Be sure terraform destroy runs --- tests/smoke/bootkube-terraform | 7 +++++-- tests/smoke/etcd3-terraform | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/smoke/bootkube-terraform b/tests/smoke/bootkube-terraform index 5544b1b5..29e9d1d8 100755 --- a/tests/smoke/bootkube-terraform +++ b/tests/smoke/bootkube-terraform @@ -71,8 +71,11 @@ cleanup() { if [[ -z "$TERRAFORM_PID" ]]; then kill $TERRAFORM_PID fi - rm -rf examples/terraform/bootkube-install/assets - rm -f examples/terraform/bootkube-install/*.tfstate* + pushd examples/terraform/bootkube-install + echo "yes" | terraform destroy || true + rm -f *.tfstate* + rm -rf assets + popd } main $@ diff --git a/tests/smoke/etcd3-terraform b/tests/smoke/etcd3-terraform index 2b25ef7b..2ddc6d4b 100755 --- a/tests/smoke/etcd3-terraform +++ b/tests/smoke/etcd3-terraform @@ -39,7 +39,10 @@ cleanup() { ./scripts/libvirt destroy || true ./scripts/devnet destroy || true rkt gc --grace-period=0 - rm -f examples/terraform/etcd3-install/*.tfstate* + pushd examples/terraform/etcd3-install + echo "yes" | terraform destroy || true + rm -f *.tfstate* + popd } main $@