Merge pull request #29867 from stbenjam/fix-retry

OCPBUGS-54412: Do not retry extension-sourced tests

Author: openshift-merge-bot[bot]

pkg/test/ginkgo/cmd_runsuite.go

@@ -509,15 +509,23 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, junitSuiteName string, mon
 
 		// Make a copy of the all failing tests (subject to the max allowed flakes) so we can have
 		// a list of tests to retry.
+		failedExtensionTestCount := 0
 		for _, test := range failing {
+			// Do not retry extension tests -- we also want to remove retries from origin-sourced
+			// tests, but extensions is where we can start.
+			if test.binary != nil {
+				failedExtensionTestCount++
+				continue
+			}
+
 			retry := test.Retry()
 			retries = append(retries, retry)
 			if len(retries) > suite.MaximumAllowedFlakes {
 				break
 			}
 		}
 
-		logrus.Warningf("Retry count: %d", len(retries))
+		logrus.Warningf("%d tests failed, %d origin-sourced tests will be retried; %d extension tests will not", len(failing), len(retries), failedExtensionTestCount)
 
 		// Run the tests in the retries list.
 		q := newParallelTestQueue(testRunnerContext)

pkg/test/ginkgo/test_suite.go

@@ -121,10 +121,12 @@ func (t *testCase) Retry() *testCase {
 	copied := &testCase{
 		name:          t.name,
 		spec:          t.spec,
+		binary:        t.binary,
 		rawName:       t.rawName,
 		binaryName:    t.binaryName,
 		locations:     t.locations,
 		testExclusion: t.testExclusion,
+		testTimeout:   t.testTimeout,
 
 		previous: t,
 	}