PoC to use OTE generated labels for skips in test-kubernetes-e2e.sh

Author: smg247

Diff for: .openshift-tests-extension/openshift_payload_hyperkube.json

@@ -1,6 +1,10 @@
 package main
 
-import et "github.com/openshift-eng/openshift-tests-extension/pkg/extension/extensiontests"
+import (
+	"fmt"
+
+	et "github.com/openshift-eng/openshift-tests-extension/pkg/extension/extensiontests"
+)
 
 // addEnvironmentSelectors adds the environmentSelector field to appropriate specs to facilitate including or excluding
 // them based on attributes of the cluster they are running on
@@ -16,7 +20,7 @@ func addEnvironmentSelectors(specs et.ExtensionTestSpecs) {
 	specs.SelectAny([]et.SelectFunction{ // Since these must use "NameContainsAll" they cannot be included in filterByPlatform
 		et.NameContainsAll("[sig-network] LoadBalancers [Feature:LoadBalancer]", "UDP"),
 		et.NameContainsAll("[sig-network] LoadBalancers [Feature:LoadBalancer]", "session affinity"),
-	}).Exclude(et.PlatformEquals("aws"))
+	}).Exclude(et.PlatformEquals("aws")).AddLabel("[Skipped:aws]")
 }
 
 // filterByPlatform is a helper function to do, simple, "NameContains" filtering on tests by platform
@@ -118,7 +122,9 @@ func filterByPlatform(specs et.ExtensionTestSpecs) {
 			selectFunctions = append(selectFunctions, et.NameContains(exclusion))
 		}
 
-		specs.SelectAny(selectFunctions).Exclude(et.PlatformEquals(platform))
+		specs.SelectAny(selectFunctions).
+			Exclude(et.PlatformEquals(platform)).
+			AddLabel(fmt.Sprintf("[Skipped:%s]", platform))
 	}
 }
 
@@ -160,7 +166,9 @@ func filterByExternalConnectivity(specs et.ExtensionTestSpecs) {
 			selectFunctions = append(selectFunctions, et.NameContains(exclusion))
 		}
 
-		specs.SelectAny(selectFunctions).Exclude(et.ExternalConnectivityEquals(externalConnectivity))
+		specs.SelectAny(selectFunctions).
+			Exclude(et.ExternalConnectivityEquals(externalConnectivity)).
+			AddLabel(fmt.Sprintf("[Skipped:%s]", externalConnectivity))
 	}
 }
 
@@ -189,7 +197,9 @@ func filterByTopology(specs et.ExtensionTestSpecs) {
 			selectFunctions = append(selectFunctions, et.NameContains(exclusion))
 		}
 
-		specs.SelectAny(selectFunctions).Exclude(et.TopologyEquals(topology))
+		specs.SelectAny(selectFunctions).
+			Exclude(et.TopologyEquals(topology)).
+			AddLabel(fmt.Sprintf("[Skipped:%s]", topology))
 	}
 }
 
@@ -208,7 +218,9 @@ func filterByNoOptionalCapabilities(specs et.ExtensionTestSpecs) {
 	for _, exclusion := range exclusions {
 		selectFunctions = append(selectFunctions, et.NameContains(exclusion))
 	}
-	specs.SelectAny(selectFunctions).Exclude(et.NoOptionalCapabilitiesExist())
+	specs.SelectAny(selectFunctions).
+		Exclude(et.NoOptionalCapabilitiesExist()).
+		AddLabel("[Skipped:NoOptionalCapabilities]")
 }
 
 // filterByNetwork is a helper function to do, simple, "NameContains" filtering on tests by network
@@ -226,6 +238,8 @@ func filterByNetwork(specs et.ExtensionTestSpecs) {
 			selectFunctions = append(selectFunctions, et.NameContains(exclusion))
 		}
 
-		specs.SelectAny(selectFunctions).Exclude(et.NetworkEquals(network))
+		specs.SelectAny(selectFunctions).
+			Exclude(et.NetworkEquals(network)).
+			AddLabel(fmt.Sprintf("[Skipped:%s]", network))
 	}
 }

Diff for: openshift-hack/cmd/k8s-tests-ext/environment_selectors.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"reflect"
 
-	"k8s.io/kubernetes/openshift-hack/e2e/annotate/generated"
 	"k8s.io/kubernetes/test/e2e/framework"
 
 	"github.com/spf13/cobra"
@@ -14,7 +13,6 @@ import (
 	"github.com/openshift-eng/openshift-tests-extension/pkg/cmd"
 	"github.com/openshift-eng/openshift-tests-extension/pkg/extension"
 	e "github.com/openshift-eng/openshift-tests-extension/pkg/extension"
-	et "github.com/openshift-eng/openshift-tests-extension/pkg/extension/extensiontests"
 	g "github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo"
 	v "github.com/openshift-eng/openshift-tests-extension/pkg/version"
 
@@ -97,11 +95,11 @@ func main() {
 	//		  the environmental skip code from the enhancement once its implemented.
 	//		- Make sure to account for test renames that occur because of removal of these
 	//		  annotations
-	specs.Walk(func(spec *et.ExtensionTestSpec) {
-		if annotations, ok := generated.Annotations[spec.Name]; ok {
-			spec.Name += annotations
-		}
-	})
+	//specs.Walk(func(spec *et.ExtensionTestSpec) {
+	//	if annotations, ok := generated.Annotations[spec.Name]; ok {
+	//		spec.Name += annotations
+	//	}
+	//})
 
 	specs = filterOutDisabledSpecs(specs)
 	addLabelsToSpecs(specs)

Diff for: openshift-hack/cmd/k8s-tests-ext/k8s-tests.go

@@ -1,6 +1,6 @@
 package e2e
 
-//go:generate go run -mod vendor ./annotate/cmd -- ./annotate/generated/zz_generated.annotations.go
+//go:generate go run -mod vendor ./label/cmd -- ./label/generated/zz_generated.labels.go
 
 // This file duplicates most of test/e2e/e2e_test.go but limits the included
 // tests (via include.go) to tests that are relevant to openshift.
@@ -16,7 +16,6 @@ import (
 	"time"
 
 	"gopkg.in/yaml.v2"
-
 	// Never, ever remove the line with "/ginkgo". Without it,
 	// the ginkgo test runner will not detect that this
 	// directory contains a Ginkgo test suite.
@@ -37,7 +36,7 @@ import (
 	"k8s.io/kubernetes/test/utils/image"
 
 	// Ensure test annotation
-	"k8s.io/kubernetes/openshift-hack/e2e/annotate/generated"
+	"k8s.io/kubernetes/openshift-hack/e2e/label/generated"
 )
 
 func TestMain(m *testing.M) {
@@ -112,14 +111,17 @@ func TestE2E(t *testing.T) {
 	// TODO(soltysh): this is raw copy from end of openshift-hack/e2e/annotate/generated/zz_generated.annotations.go
 	// https://issues.redhat.com/browse/OCPBUGS-25641
 	ginkgo.GetSuite().SetAnnotateFn(func(name string, node types.TestSpec) {
-		if newLabels, ok := generated.Annotations[name]; ok {
-			node.AppendText(newLabels)
+		if newLabels, ok := generated.Labels[name]; ok {
+			node.AppendText(strings.Replace(newLabels, ",", " ", -1))
 		} else {
-			panic(fmt.Sprintf("unable to find test %s", name))
+			//TODO: this panic is happening because we have removed tests that OTE has disabled entirely, lets just exclude for now...
+			//panic(fmt.Sprintf("unable to find test %s", name))
+			node.AppendText("[Disabled:missing]")
 		}
 		if strings.Contains(name, "Kubectl client Kubectl prune with applyset should apply and prune objects") {
 			fmt.Printf("Trying to annotate %q\n", name)
 		}
+
 	})
 
 	e2e.RunE2ETests(t)

Diff for: openshift-hack/e2e/annotate/cmd/main.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"k8s.io/kubernetes/openshift-hack/e2e/label"
+)
+
+func main() {
+	//annotate.Run(annotate.TestMaps, func(name string) bool { return false }) TODO
+	label.Run()
+}