finalize zuul job

kubernetes-sigs · Mar 30, 2020 · 4262cf1 · 4262cf1
1 parent b439d4a
commit 4262cf1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.zuul/playbooks/run.yaml b/.zuul/playbooks/run.yaml
@@ -79,7 +79,7 @@
         export CONTROL_PLANE_MACHINE_COUNT=1
         export WORKER_MACHINE_COUNT=1
 
-        ./hack/ci/e2e-conformance.sh --install-prereqs --run-tests-parallel {{ extra_args }}
+        ./hack/ci/e2e-conformance.sh --install-prereqs --run-tests-parallel --delete-cluster {{ extra_args }}
 
         # Print some infos
         ps aux

diff --git a/hack/ci/e2e-conformance.sh b/hack/ci/e2e-conformance.sh
@@ -418,12 +418,17 @@ main() {
 
   if [[ -z "${SKIP_RUN_TESTS:-}" ]]; then
     echo "Running tests..."
-    # save some resources for tests
-    dump_kind_logs
-    make kind-reset
-
     run_tests
   fi
+
+  DELETE_CLUSTER=${DELETE_CLUSTER:-""}
+  if [[ "${DELETE_CLUSTER}" == "yes" || "${DELETE_CLUSTER}" == "1" ]]; then
+    echo "Dumping logs"
+    dump_logs
+
+    echo "Deleting cluster..."
+    delete_cluster
+  fi
 }
 
 main "$@"