add the option to omit the annotations when running 'list tests' that is useful when generating the labels, and some more cleanup

Author: smg247

openshift-hack/cmd/k8s-tests-ext/k8s-tests.go

@@ -4,7 +4,11 @@ import (
 	"flag"
 	"os"
 	"reflect"
+	"strconv"
 
+	et "github.com/openshift-eng/openshift-tests-extension/pkg/extension/extensiontests"
+	"github.com/sirupsen/logrus"
+	"k8s.io/kubernetes/openshift-hack/e2e/annotate/generated"
 	"k8s.io/kubernetes/test/e2e/framework"
 
 	"github.com/spf13/cobra"
@@ -95,12 +99,22 @@ 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
-	//TODO: this will have to be added back for now, but can we use the new logic anyways? test it...
-	//specs.Walk(func(spec *et.ExtensionTestSpec) {
-	//	if annotations, ok := generated.Annotations[spec.Name]; ok {
-	//		spec.Name += annotations
-	//	}
-	//})
+	var omitAnnotations bool
+	omitAnnotationsVal := os.Getenv("OMIT_ANNOTATIONS")
+	if omitAnnotationsVal != "" {
+		omitAnnotations, err = strconv.ParseBool(omitAnnotationsVal)
+		if err != nil {
+			logrus.WithError(err).Fatal("Failed to parse OMIT_ANNOTATIONS")
+		}
+	}
+	if !omitAnnotations {
+		logrus.Infof("adding annotations as OMIT_ANNOTATIONS was either false, or not provided")
+		specs.Walk(func(spec *et.ExtensionTestSpec) {
+			if annotations, ok := generated.Annotations[spec.Name]; ok {
+				spec.Name += annotations
+			}
+		})
+	}
 
 	specs = filterOutDisabledSpecs(specs)
 	addLabelsToSpecs(specs)

openshift-hack/e2e/kube_e2e_test.go

@@ -110,10 +110,10 @@ func TestMain(m *testing.M) {
 func TestE2E(t *testing.T) {
 	ginkgo.GetSuite().SetAnnotateFn(func(name string, node types.TestSpec) {
 		if newLabels, ok := generated.Labels[name]; ok {
-			node.AppendText(strings.Replace(newLabels, ",", " ", -1))
+			node.AppendText(fmt.Sprintf(" %s", strings.Replace(newLabels, ",", " ", -1)))
 		} else {
 			// If the name isn't found in the generated labels file, it is because the test has been disabled via OTE
-			node.AppendText("[Disabled:missing]")
+			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)