test/e2e: improvements

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>

test/e2e/e2e_test.go

@@ -3,6 +3,7 @@ package e2e
 import (
 	"context"
 	"flag"
+	"fmt"
 	"os"
 	"testing"
 	"time"
@@ -11,11 +12,17 @@ import (
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	operatorsv1 "github.com/operator-framework/api/pkg/operators/v1"
 	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
 )
 
+func init() {
+	log.SetLogger(zap.New())
+}
+
 var (
 	kubeConfigPath = flag.String(
 		"kubeconfig", "", "path to the kubeconfig file")
@@ -125,5 +132,9 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
+	if env := os.Getenv("SKIP_CLEANUP"); env != "" {
+		fmt.Println("Skipping deprovisioning...")
+		return
+	}
 	deprovision()
 })