UPSTREAM: <carry>: remove annotation framework in favor of environment selectors

Author: smg247

REBASE.openshift.md

@@ -273,19 +273,20 @@ go mod tidy && go mod vendor
 
 Alternatively, you can edit `go.mod` file manually with your favourite editor and use search&replace.
 
-## Review test annotation rules
+## Review test environmental selection rules
 
-The names of upstream e2e tests are annotated according to the a set of
-[declarative rules](openshift-hack/e2e/annotate/rules.go). These annotations
-are used to group tests into suites and to skip tests that are known not to be
-incompatible with some or all configurations of OpenShift.
+Test environmental selection rules are defined in two files:
+- [disabled_tests.go](openshift-hack/cmd/k8s-tests-ext/disabled_tests.go) - for completely disabled tests
+- [environment_selectors.go](openshift-hack/cmd/k8s-tests-ext/environment_selectors.go) - for conditionally skipped tests
+
+These rules are used to skip tests that are known to be incompatible with some or all configurations of OpenShift.
 
 When performing a rebase, it is important to review the rules to
 ensure they are still relevant:
 
-- [ ] Ensure that `[Disabled:Alpha]` rules are appropriate for the current kube
+- [ ] Ensure that `Alpha` rules in [disabled_tests.go](openshift-hack/cmd/k8s-tests-ext/disabled_tests.go) are appropriate for the current kube
       level. Alpha features that are not enabled by default should be targeted
-      by this annotation to ensure that tests of those features are skipped.
+      by these rules to ensure that tests of those features are skipped.
 - [ ] Add new skips (along with a bz to track resolution) where e2e tests fail
       consistently.
 

hack/update-test-annotations.sh

@@ -2,14 +2,9 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"os"
 	"reflect"
-	"strconv"
 
-	et "github.com/openshift-eng/openshift-tests-extension/pkg/extension/extensiontests"
-
-	"k8s.io/kubernetes/openshift-hack/e2e/annotate/generated"
 	"k8s.io/kubernetes/test/e2e/framework"
 
 	"github.com/spf13/cobra"
@@ -61,31 +56,31 @@ func main() {
 		Parents: []string{
 			"openshift/conformance/parallel/minimal",
 		},
-		Qualifiers: []string{withExcludedTestsFilter(`!name.contains('[Serial]') && labels.exists(l, l == "Conformance")`)},
+		Qualifiers: []string{`!name.contains('[Serial]') && labels.exists(l, l == "Conformance")`},
 	})
 
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/serial/minimal",
 		Parents: []string{
 			"openshift/conformance/serial/minimal",
 		},
-		Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]') && labels.exists(l, l == "Conformance")`)},
+		Qualifiers: []string{`name.contains('[Serial]') && labels.exists(l, l == "Conformance")`},
 	})
 
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/parallel",
 		Parents: []string{
 			"openshift/conformance/parallel",
 		},
-		Qualifiers: []string{withExcludedTestsFilter(`!name.contains('[Serial]')`)},
+		Qualifiers: []string{`!name.contains('[Serial]')`},
 	})
 
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/serial",
 		Parents: []string{
 			"openshift/conformance/serial",
 		},
-		Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]')`)},
+		Qualifiers: []string{`name.contains('[Serial]')`},
 	})
 
 	for k, v := range image.GetOriginalImageConfigs() {
@@ -109,30 +104,6 @@ func main() {
 		}
 	})
 
-	// Annotations get appended to test names, these are additions to upstream
-	// tests for controlling skips, suite membership, etc.
-	//
-	// TODO:
-	//		- Remove this annotation code, and migrate to Labels/Tags and
-	//		  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
-	var omitAnnotations bool
-	omitAnnotationsVal := os.Getenv("OMIT_ANNOTATIONS")
-	if omitAnnotationsVal != "" {
-		omitAnnotations, err = strconv.ParseBool(omitAnnotationsVal)
-		if err != nil {
-			panic("Failed to parse OMIT_ANNOTATIONS: " + err.Error())
-		}
-	}
-	if !omitAnnotations {
-		specs.Walk(func(spec *et.ExtensionTestSpec) {
-			if annotations, ok := generated.Annotations[spec.Name]; ok {
-				spec.Name += annotations
-			}
-		})
-	}
-
 	specs = filterOutDisabledSpecs(specs)
 	addLabelsToSpecs(specs)
 
@@ -179,27 +150,3 @@ func convertToImage(obj interface{}) e.Image {
 	}
 	return image
 }
-
-func withExcludedTestsFilter(baseExpr string) string {
-	excluded := []string{
-		"[Disabled:",
-		"[Disruptive]",
-		"[Skipped]",
-		"[Slow]",
-		"[Flaky]",
-		"[Local]",
-	}
-
-	filter := ""
-	for i, s := range excluded {
-		if i > 0 {
-			filter += " && "
-		}
-		filter += fmt.Sprintf("!name.contains('%s')", s)
-	}
-
-	if baseExpr != "" {
-		return fmt.Sprintf("(%s) && (%s)", baseExpr, filter)
-	}
-	return filter
-}