From 3943dc1370536cbc89ed9366956438b764cbcda4 Mon Sep 17 00:00:00 2001 From: ehila Date: Tue, 23 Jul 2024 01:25:14 -0400 Subject: [PATCH] UPSTREAM: : update test annotations for sno recent addition of upstream architecture package to openshift tests include.go is breaking conformance tests for sno should squash with tooling Signed-off-by: ehila --- .../e2e/annotate/generated/zz_generated.annotations.go | 2 +- openshift-hack/e2e/annotate/rules.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go b/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go index db015383f3cb6..13fdf328e52ea 100644 --- a/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go +++ b/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go @@ -575,7 +575,7 @@ var Annotations = map[string]string{ "[sig-apps] stateful Upgrade [Feature:StatefulUpgrade] stateful upgrade should maintain a functioning cluster": " [Disabled:Unimplemented] [Suite:k8s]", - "[sig-architecture] Conformance Tests should have at least two untainted nodes [Conformance]": " [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", + "[sig-architecture] Conformance Tests should have at least two untainted nodes [Conformance]": " [Skipped:SingleReplicaTopology] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", "[sig-auth] Certificates API [Privileged:ClusterAdmin] should support CSR API operations [Conformance]": " [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]", diff --git a/openshift-hack/e2e/annotate/rules.go b/openshift-hack/e2e/annotate/rules.go index 3655cf1f7966f..bbc01139b3f2d 100644 --- a/openshift-hack/e2e/annotate/rules.go +++ b/openshift-hack/e2e/annotate/rules.go @@ -334,6 +334,7 @@ var ( `\[sig-cli\] Kubectl client Kubectl taint \[Serial\] should remove all the taints with the same key off a node`, `\[sig-network\] LoadBalancers should be able to preserve UDP traffic when server pod cycles for a LoadBalancer service on different nodes`, `\[sig-network\] LoadBalancers should be able to preserve UDP traffic when server pod cycles for a LoadBalancer service on the same nodes`, + `\[sig-architecture\] Conformance Tests should have at least two untainted nodes`, }, // Tests which can't be run/don't make sense to run against a cluster with all optional capabilities disabled