From feaebbf8027cf2110e380b43b2fe50da8f70886a Mon Sep 17 00:00:00 2001 From: Stephen Goeddel Date: Thu, 6 Nov 2025 14:32:27 -0500 Subject: [PATCH] remove skipped annotations synthetic test --- pkg/test/ginkgo/cmd_runsuite.go | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/pkg/test/ginkgo/cmd_runsuite.go b/pkg/test/ginkgo/cmd_runsuite.go index 1f0a15b8a72e..ede1a7d3a708 100644 --- a/pkg/test/ginkgo/cmd_runsuite.go +++ b/pkg/test/ginkgo/cmd_runsuite.go @@ -218,28 +218,6 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc logrus.Infof("Discovered %d total tests", len(specs)) - // Temporarily check for the presence of the [Skipped:xyz] annotation in the test names, once this synthetic test - // begins to pass we can remove the annotation logic - var annotatedSkipped []string - for _, t := range specs { - if strings.Contains(t.Name, "[Skipped") { - annotatedSkipped = append(annotatedSkipped, t.Name) - } - } - var fallbackSyntheticTestResult []*junitapi.JUnitTestCase - var skippedAnnotationSyntheticTestResults []*junitapi.JUnitTestCase - skippedAnnotationSyntheticTestResult := junitapi.JUnitTestCase{ - Name: "[sig-trt] Skipped annotations present", - } - if len(annotatedSkipped) > 0 { - skippedAnnotationSyntheticTestResult.FailureOutput = &junitapi.FailureOutput{ - Message: fmt.Sprintf("Skipped Annotations present in tests: %s", strings.Join(annotatedSkipped, ", ")), - } - } - skippedAnnotationSyntheticTestResults = append(skippedAnnotationSyntheticTestResults, &skippedAnnotationSyntheticTestResult) - // If this fails, this additional run will make it flake - skippedAnnotationSyntheticTestResults = append(skippedAnnotationSyntheticTestResults, &junitapi.JUnitTestCase{Name: skippedAnnotationSyntheticTestResult.Name}) - // skip tests due to newer k8s restConfig, err := clusterinfo.GetMonitorRESTConfig() if err != nil { @@ -607,7 +585,6 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc var syntheticTestResults []*junitapi.JUnitTestCase var syntheticFailure bool syntheticTestResults = append(syntheticTestResults, stableClusterTestResults...) - syntheticTestResults = append(syntheticTestResults, skippedAnnotationSyntheticTestResults...) timeSuffix := fmt.Sprintf("_%s", start.UTC().Format("20060102-150405")) @@ -624,12 +601,6 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc wasMasterNodeUpdated := "" if events := monitorEventRecorder.Intervals(start, end); len(events) > 0 { buf := &bytes.Buffer{} - if !upgrade { - // the current mechanism for external binaries does not support upgrade - // tests, so don't report information there at all - syntheticTestResults = append(syntheticTestResults, fallbackSyntheticTestResult...) - } - if len(syntheticTestResults) > 0 { // mark any failures by name failingSyntheticTestNames, flakySyntheticTestNames := sets.NewString(), sets.NewString()