Merge pull request #2331 from smg247/ann-removal-fix-micro

TRT-2068: Reintroduce non-suite annotation removal

Author: openshift-merge-bot[bot]

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

@@ -145,11 +145,23 @@ func filterByExternalConnectivity(specs et.ExtensionTestSpecs) {
 		// because of pullthrough not supporting ICSP (https://bugzilla.redhat.com/show_bug.cgi?id=1918376)
 		"Disconnected": {
 			"[sig-network] Networking should provide Internet connection for containers",
+			// The following tests are all duplicated from the Proxied list as the concepts of Disconnected and Proxied
+			// have gotten muddied. The following tests should all be skipped when accessing the cluster via a proxy,
+			// this is a separate concept from external connectivity that will later be formalized with a new environment
+			// flag in https://issues.redhat.com/browse/TRT-1854.
+			// TODO(sgoeddel): remove the following, duplicated, tests once this is complete
+			"[sig-cli] Kubectl client Simple pod should support exec through an HTTP proxy",
+			"[sig-cli] Kubectl client Simple pod should support exec through kubectl proxy",
+			"[sig-node] Pods should support retrieving logs from the container over websockets",
+			"[sig-node] Pods should support retrieving logs from the container over websockets",
+			"[sig-cli] Kubectl Port forwarding With a server listening on localhost should support forwarding over websockets",
+			"[sig-cli] Kubectl Port forwarding With a server listening on 0.0.0.0 should support forwarding over websockets",
+			"[sig-node] Pods should support remote command execution over websockets",
 		},
 		// These tests are skipped when openshift-tests needs to use a proxy to reach the
 		// cluster -- either because the test won't work while proxied, or because the test
 		// itself is testing a functionality using it's own proxy.
-		"Proxy": {
+		"Proxied": {
 			// These tests setup their own proxy, which won't work when we need to access the
 			// cluster through a proxy.
 			"[sig-cli] Kubectl client Simple pod should support exec through an HTTP proxy",
@@ -160,7 +172,7 @@ func filterByExternalConnectivity(specs et.ExtensionTestSpecs) {
 			"[sig-cli] Kubectl Port forwarding With a server listening on localhost should support forwarding over websockets",
 			"[sig-cli] Kubectl Port forwarding With a server listening on 0.0.0.0 should support forwarding over websockets",
 			"[sig-node] Pods should support remote command execution over websockets",
-			// These tests are flacky and require internet access
+			// These tests are flaky and require internet access
 			// See https://bugzilla.redhat.com/show_bug.cgi?id=2019375
 			"[sig-network] DNS should resolve DNS of partial qualified names for services",
 			"[sig-network] DNS should provide DNS for the cluster",
@@ -184,7 +196,7 @@ func filterByExternalConnectivity(specs et.ExtensionTestSpecs) {
 // filterByTopology is a helper function to do, simple, "NameContains" filtering on tests by topology
 func filterByTopology(specs et.ExtensionTestSpecs) {
 	var topologyExclusions = map[string][]string{
-		"SingleReplicaTopology": {
+		"SingleReplica": {
 			"[sig-apps] Daemon set [Serial] should rollback without unnecessary restarts [Conformance]",
 			"[sig-node] NoExecuteTaintManager Single Pod [Serial] doesn't evict pod with tolerations from tainted nodes",
 			"[sig-node] NoExecuteTaintManager Single Pod [Serial] eventually evict pod with finite tolerations from tainted nodes",

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

@@ -38,6 +38,29 @@ func addLabelsToSpecs(specs et.ExtensionTestSpecs) {
 
 			"[sig-network] IngressClass [Feature:Ingress] should set default value on new IngressClass", //https://bugzilla.redhat.com/show_bug.cgi?id=1833583
 		},
+		"[sig-node]": {
+			"[NodeConformance]",
+			"NodeLease",
+			"lease API",
+			"[NodeFeature",
+			"[NodeAlphaFeature",
+			"Probing container",
+			"Security Context When creating a",
+			"Downward API should create a pod that prints his name and namespace",
+			"Liveness liveness pods should be automatically restarted",
+			"Secret should create a pod that reads a secret",
+			"Pods should delete a collection of pods",
+			"Pods should run through the lifecycle of Pods and PodStatus",
+		},
+		"[sig-cluster-lifecycle]": {
+			"Feature:ClusterAutoscalerScalability",
+			"recreate nodes and ensure they function",
+		},
+		"[sig-arch]": {
+			// not run, assigned to arch as catch-all
+			"[Feature:GKELocalSSD]",
+			"[Feature:GKENodePool]",
+		},
 	}
 
 	for label, names := range namesByLabel {