[WIP] Feature: run upstream serving operator tests

.gitignore

@@ -2,3 +2,4 @@
 catalogsource-ci.yaml
 user*.kubeconfig
 users.htpasswd
+.idea

Gopkg.toml

@@ -2,6 +2,7 @@
 required = [
   "github.com/knative/test-infra/scripts",
   "github.com/knative/test-infra/tools/dep-collector",
+  "knative.dev/serving-operator/cmd/manager/kodata/knative-serving",
 ]
 
 [prune]
@@ -13,6 +14,10 @@ required = [
   name = "github.com/knative/test-infra"
   non-go = false
 
+[[prune.project]]
+  name = "knative.dev/serving-operator"
+  non-go = false
+
 [[override]]
   name = "k8s.io/api"
   # revision for tag "kubernetes-1.13.1"
@@ -34,8 +39,9 @@ required = [
   revision = "8d9ed539ba3134352c586810e749e58df4e94e4f"
 
 [[constraint]]
-  branch = "master"
   name = "knative.dev/serving-operator"
+  branch = "feature/v0.9-reuse-tests-on-productized"
+  source = "github.com/cardil/serving-operator"
 
 [[constraint]]
   branch = "master"

hack/lib/common.bash

@@ -32,7 +32,11 @@ function timeout {
     seconds=$(( seconds + interval ))
     logger.debug "Execution failed: ${*}. Waiting ${interval} sec ($seconds/${timeout})..."
     if [[ "${LOG_LEVEL}" != 'DEBUG' ]]; then
-      echo -n '.'
+      if (( INTERACTIVE )); then
+        echo -n '.'
+      else
+        echo '.'
+      fi
     fi
     sleep $interval
     [[ $seconds -gt $timeout ]] && logger.error "Timed out of ${timeout} exceeded" && return 1

test/e2e/knative_serving_test.go

@@ -1,3 +1,5 @@
+// +build e2e
+
 package e2e
 
 import (
@@ -30,12 +32,7 @@ func TestKnativeServing(t *testing.T) {
 	defer test.CleanupAll(caCtx, paCtx, editCtx, viewCtx)
 	test.CleanupOnInterrupt(t, func() { test.CleanupAll(caCtx, paCtx, editCtx, viewCtx) })
 
-	t.Run("create subscription and wait for CSV to succeed", func(t *testing.T) {
-		_, err := test.WithOperatorReady(caCtx, "serverless-operator-subscription")
-		if err != nil {
-			t.Fatal("Failed", err)
-		}
-	})
+	createSubscriptionAndWaitForCSVtoSucceed(t, caCtx)
 
 	t.Run("deploy knativeserving cr and wait for it to be ready", func(t *testing.T) {
 		_, err := test.WithKnativeServingReady(caCtx, knativeServing, knativeServing)
@@ -78,13 +75,7 @@ func TestKnativeServing(t *testing.T) {
 		}
 	})
 
-	t.Run("undeploy serverless operator and check dependent operators removed", func(t *testing.T) {
-		caCtx.Cleanup()
-		err := test.WaitForOperatorDepsDeleted(caCtx)
-		if err != nil {
-			t.Fatalf("Operators still running: %v", err)
-		}
-	})
+	undeployServerlessOperatorAndCheckDependentOperatorsRemoved(t, caCtx)
 }
 
 func testKnativeVersusKubeServicesInOneNamespace(t *testing.T, caCtx *test.Context) {

test/e2e/serverless_lifecycle.go

@@ -0,0 +1,36 @@
+package e2e
+
+import (
+	"github.com/openshift-knative/serverless-operator/test"
+	"os"
+	"testing"
+)
+
+func createSubscriptionAndWaitForCSVtoSucceed(t *testing.T, ctx *test.Context) {
+	t.Run("create subscription and wait for CSV to succeed", func(t *testing.T) {
+		_, err := test.WithOperatorReady(ctx, "serverless-operator-subscription")
+		if err != nil {
+			t.Fatal("Failed", err)
+		}
+	})
+}
+
+func undeployServerlessOperatorAndCheckDependentOperatorsRemoved(t *testing.T, ctx *test.Context) {
+	if t.Failed() && runsOnCiOperator() {
+		t.Log("Skipping updeployment of serverless as tests failed and we are running on Openshift CI")
+		return
+	}
+	t.Run("undeploy serverless operator and check dependent operators removed", func(t *testing.T) {
+		ctx.Cleanup()
+		err := test.WaitForOperatorDepsDeleted(ctx)
+		if err != nil {
+			t.Fatalf("Operators still running: %v", err)
+		}
+	})
+}
+
+func runsOnCiOperator() bool {
+	_, ok := os.LookupEnv("OPENSHIFT_BUILD_NAMESPACE")
+	return ok
+}
+

test/e2e/upstream_serving_operator_test.go

@@ -0,0 +1,33 @@
+// +build e2e
+
+package e2e
+
+import (
+	"testing"
+
+	"github.com/openshift-knative/serverless-operator/test"
+	upstreame2e "knative.dev/serving-operator/test/e2e"
+	upstreamtest "knative.dev/serving-operator/test"
+)
+
+func TestUpstreamKnativeServingOperator(t *testing.T) {
+	upstreamtest.ServingOperatorNamespace = "knative-serving"
+	suite := upstreame2e.ComplianceSuite()
+	ctx := test.SetupClusterAdmin(t)
+
+	defer test.CleanupAll(ctx)
+	test.CleanupOnInterrupt(t, func() { test.CleanupAll(ctx) })
+
+	createSubscriptionAndWaitForCSVtoSucceed(t, ctx)
+
+	skipConfigureSubTest := upstreamtest.Skip(
+		"TestKnativeServingDeployment/configure",
+		"Skip due to SRVKS-241")
+
+	upstreamtest.
+		NewContext(t).
+		WithOverride(skipConfigureSubTest).
+		RunSuite(suite)
+
+	undeployServerlessOperatorAndCheckDependentOperatorsRemoved(t, ctx)
+}