Recovered deleted function and added highlighting logging before and …

…after e2e go testing call. Signed-off-by: Diana Arroyo <darroyo@us.ibm.com>

hack/run-e2e-kind.sh

@@ -77,7 +77,7 @@ function kind-up-cluster {
 
 # clean up
 function cleanup {
- echo "Cleaning up..."
+ echo "==========================>>>>> Cleaning up... <<<<<=========================="
  echo " "
 
  echo "Custom Resource Definitions..."
@@ -104,7 +104,7 @@ function cleanup {
  kind delete cluster ${CLUSTER_CONTEXT}
 }
 
-function kube-batch-up {
+function kube-test-env-up {
  cd ${ROOT_DIR}
 
  export KUBECONFIG="$(kind get kubeconfig-path ${CLUSTER_CONTEXT})"
@@ -165,9 +165,9 @@ trap cleanup EXIT
 
 kind-up-cluster
 
-kube-batch-up
+kube-test-env-up
 
 cd ${ROOT_DIR}
 
-echo "Running E2E tests..."
+echo "==========================>>>>> Running E2E tests... <<<<<=========================="
 go test ./test/e2e -v -timeout 30m

test/e2e/util.go

@@ -129,9 +129,27 @@ func namespaceNotExist(ctx *context) wait.ConditionFunc {
 }
 }
 
-
 func cleanupTestContext(cxt *context) {
-//DO NOTHING
+ foreground := metav1.DeletePropagationForeground
+
+ err := cxt.kubeclient.CoreV1().Namespaces().Delete(cxt.namespace, &metav1.DeleteOptions{
+ PropagationPolicy: &foreground,
+ })
+ Expect(err).NotTo(HaveOccurred())
+
+ err = cxt.kubeclient.SchedulingV1beta1().PriorityClasses().Delete(masterPriority, &metav1.DeleteOptions{
+ PropagationPolicy: &foreground,
+ })
+ Expect(err).NotTo(HaveOccurred())
+
+ err = cxt.kubeclient.SchedulingV1beta1().PriorityClasses().Delete(workerPriority, &metav1.DeleteOptions{
+ PropagationPolicy: &foreground,
+ })
+ Expect(err).NotTo(HaveOccurred())
+
+ // Wait for namespace deleted.
+ err = wait.Poll(100*time.Millisecond, oneMinute, namespaceNotExist(cxt))
+ Expect(err).NotTo(HaveOccurred())
 }
 
 type taskSpec struct {