github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

e2e: enforce usage of WithFlaky instead of [Flaky]

Browse Source 
Now that we have it (8a89a1f5a5), let's also make sure that
the new WithFlaky is used everywhere instead if [Flaky]. This way it can be
used for filtering by label.
This commit is contained in:
Patrick Ohly 2024-01-19 12:17:37 +01:00
parent eb1ae05cf0
commit de014579a1
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/apimachinery/crd_publish_openapi.go
View File

@ -479,7 +479,7 @@ var _ = SIGDescribe("CustomResourcePublishOpenAPI [Privileged:ClusterAdmin]", fu
}) })
// Marked as flaky until https://github.com/kubernetes/kubernetes/issues/65517 is solved. // Marked as flaky until https://github.com/kubernetes/kubernetes/issues/65517 is solved.
ginkgo.It("[Flaky] kubectl explain works for CR with the same resource name as built-in object.", func(ctx context.Context) { f.It(f.WithFlaky(), "kubectl explain works for CR with the same resource name as built-in object.", func(ctx context.Context) {
customServiceShortName := fmt.Sprintf("ksvc-%d", time.Now().Unix()) // make short name unique customServiceShortName := fmt.Sprintf("ksvc-%d", time.Now().Unix()) // make short name unique
opt := func(crd *apiextensionsv1.CustomResourceDefinition) { opt := func(crd *apiextensionsv1.CustomResourceDefinition) {
crd.ObjectMeta = metav1.ObjectMeta{Name: "services." + crd.Spec.Group} crd.ObjectMeta = metav1.ObjectMeta{Name: "services." + crd.Spec.Group}

2
test/e2e/framework/ginkgowrapper.go
View File

@ -248,7 +248,7 @@ func registerInSuite(ginkgoCall func(string, ...interface{}) bool, args []interf
var ( var (
tagRe = regexp.MustCompile(`\[.*?\]`) tagRe = regexp.MustCompile(`\[.*?\]`)
deprecatedTags = sets.New("Conformance", "NodeConformance", "Disruptive", "Serial", "Slow") deprecatedTags = sets.New("Conformance", "Flaky", "NodeConformance", "Disruptive", "Serial", "Slow")
deprecatedTagPrefixes = sets.New("Environment", "Feature", "NodeFeature", "FeatureGate") deprecatedTagPrefixes = sets.New("Environment", "Feature", "NodeFeature", "FeatureGate")
deprecatedStability = sets.New("Alpha", "Beta") deprecatedStability = sets.New("Alpha", "Beta")
) )

2
test/e2e/node/kubelet.go
View File

@ -385,7 +385,7 @@ var _ = SIGDescribe("kubelet", func() {
}) })
// Test host cleanup when disrupting the volume environment. // Test host cleanup when disrupting the volume environment.
ginkgo.Describe("host cleanup with volume mounts [HostCleanup][Flaky]", func() { f.Describe("host cleanup with volume mounts [HostCleanup]", f.WithFlaky(), func() {
type hostCleanupTest struct { type hostCleanupTest struct {
itDescr string itDescr string

6
test/e2e/node/security_context.go
View File

@ -186,15 +186,15 @@ var _ = SIGDescribe("Security Context", func() {
}) })
}) })
ginkgo.It("should support volume SELinux relabeling [Flaky] [LinuxOnly]", func(ctx context.Context) { f.It("should support volume SELinux relabeling", f.WithFlaky(), f.WithLabel("LinuxOnly"), func(ctx context.Context) {
testPodSELinuxLabeling(ctx, f, false, false) testPodSELinuxLabeling(ctx, f, false, false)
}) })
ginkgo.It("should support volume SELinux relabeling when using hostIPC [Flaky] [LinuxOnly]", func(ctx context.Context) { f.It("should support volume SELinux relabeling when using hostIPC", f.WithFlaky(), f.WithLabel("LinuxOnly"), func(ctx context.Context) {
testPodSELinuxLabeling(ctx, f, true, false) testPodSELinuxLabeling(ctx, f, true, false)
}) })
ginkgo.It("should support volume SELinux relabeling when using hostPID [Flaky] [LinuxOnly]", func(ctx context.Context) { f.It("should support volume SELinux relabeling when using hostPID", f.WithFlaky(), f.WithLabel("LinuxOnly"), func(ctx context.Context) {
testPodSELinuxLabeling(ctx, f, false, true) testPodSELinuxLabeling(ctx, f, false, true)
}) })

2
test/e2e/storage/nfs_persistent_volume-disruptive.go
View File

@ -75,7 +75,7 @@ func checkForControllerManagerHealthy(ctx context.Context, duration time.Duratio
return nil return nil
} }
var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), "[Flaky]", func() { var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), framework.WithFlaky(), func() {
f := framework.NewDefaultFramework("disruptive-pv") f := framework.NewDefaultFramework("disruptive-pv")
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged

2
test/e2e/storage/persistent_volumes-local.go
View File

@ -294,7 +294,7 @@ var _ = utils.SIGDescribe("PersistentVolumes-local", func() {
e2epod.DeletePodOrFail(ctx, config.client, config.ns, pod2.Name) e2epod.DeletePodOrFail(ctx, config.client, config.ns, pod2.Name)
}) })
ginkgo.It("should set different fsGroup for second pod if first pod is deleted [Flaky]", func(ctx context.Context) { f.It("should set different fsGroup for second pod if first pod is deleted", f.WithFlaky(), func(ctx context.Context) {
// TODO: Disabled temporarily, remove [Flaky] tag after #73168 is fixed. // TODO: Disabled temporarily, remove [Flaky] tag after #73168 is fixed.
fsGroup1, fsGroup2 := int64(1234), int64(4321) fsGroup1, fsGroup2 := int64(1234), int64(4321)
ginkgo.By("Create first pod and check fsGroup is set") ginkgo.By("Create first pod and check fsGroup is set")