e2e: delete global (Flux) resources in teardowns

fluxcd · Nov 4, 2019 · 8dc349e · 8dc349e
1 parent a0af3b4
commit 8dc349e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/test/e2e/10_helm_chart.bats b/test/e2e/10_helm_chart.bats
@@ -22,14 +22,7 @@ function setup() {
 }
 
 function teardown() {
-  # For debugging purposes (in case the test fails)
-  echo '>>> Flux logs'
-  kubectl -n "${FLUX_NAMESPACE}" logs deployment/flux
-  echo '>>> List pods'
-  kubectl -n "${DEMO_NAMESPACE}" get pods
-  echo '>>> Check workload'
-  kubectl -n "${DEMO_NAMESPACE}" rollout status deployment/podinfo
-
+  # Removing Flux also takes care of the global resources it installs.
   uninstall_flux_with_helm
   uninstall_tiller
   # Removing the namespace also takes care of removing gitsrv.

diff --git a/test/e2e/11_fluxctl_install.bats b/test/e2e/11_fluxctl_install.bats
@@ -17,14 +17,8 @@ function setup() {
 }
 
 function teardown() {
-  # For debugging purposes (in case the test fails)
-  echo '>>> Flux logs'
-  kubectl -n "${FLUX_NAMESPACE}" logs deployment/flux
-  echo '>>> List pods'
-  kubectl -n "${DEMO_NAMESPACE}" get pods
-  echo '>>> Check workload'
-  kubectl -n "${DEMO_NAMESPACE}" rollout status deployment/podinfo
-
+  # Removing Flux also takes care of the global resources it installs.
+  uninstall_flux_with_fluxctl
   # Removing the namespace also takes care of removing Flux and gitsrv.
   kubectl delete namespace "$FLUX_NAMESPACE"
   # Only remove the demo workloads after Flux, so that they cannot be recreated.

diff --git a/test/e2e/12_sync.bats b/test/e2e/12_sync.bats
@@ -46,9 +46,12 @@ function setup() {
 }
 
 function teardown() {
+  # Teardown the created port-forward to gitsrv and restore Git settings.
   kill "$git_port_forward_pid"
   unset GIT_SSH_COMMAND
-  # Removing the namespace also takes care of removing Flux and gitsrv.
+  # Uninstall Flux and the global resources it installs.
+  uninstall_flux_with_fluxctl
+  # Removing the namespace also takes care of removing gitsrv.
   kubectl delete namespace "$FLUX_NAMESPACE"
   # Only remove the demo workloads after Flux, so that they cannot be recreated.
   kubectl delete namespace "$DEMO_NAMESPACE"

diff --git a/test/e2e/20_commit_signing.bats b/test/e2e/20_commit_signing.bats
@@ -66,8 +66,11 @@ function setup() {
 }
 
 function teardown() {
+  # Teardown the created port-forward to gitsrv and restore Git settings.
   kill "$git_port_forward_pid"
   unset GIT_SSH_COMMAND
+  # Uninstall Flux and the global resources it installs.
+  uninstall_flux_gpg
   # Removing the namespace also takes care of removing Flux and gitsrv.
   kubectl delete namespace "$FLUX_NAMESPACE"
   # Only remove the demo workloads after Flux, so that they cannot be recreated.