Skip to content

Commit 20578e7

Browse files
Merge pull request #30411 from maxcao13/separate-hpa-tests
OCPBUGS-61376: Isolate HPA tests
2 parents 2492df5 + 3007cfa commit 20578e7

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

pkg/test/ginkgo/cmd_runsuite.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,10 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
446446
return strings.Contains(t.name, "[sig-network]")
447447
})
448448

449+
hpaTests, kubeTests := splitTests(kubeTests, func(t *testCase) bool {
450+
return strings.Contains(t.name, "[Feature:HPA]")
451+
})
452+
449453
networkTests, openshiftTests := splitTests(openshiftTests, func(t *testCase) bool {
450454
return strings.Contains(t.name, "[sig-network]")
451455
})
@@ -462,6 +466,7 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
462466
logrus.Infof("Found %d kube tests", len(kubeTests))
463467
logrus.Infof("Found %d storage tests", len(storageTests))
464468
logrus.Infof("Found %d network k8s tests", len(networkK8sTests))
469+
logrus.Infof("Found %d HPA tests", len(hpaTests))
465470
logrus.Infof("Found %d network tests", len(networkTests))
466471
logrus.Infof("Found %d builds tests", len(buildsTests))
467472
logrus.Infof("Found %d must-gather tests", len(mustGatherTests))
@@ -473,6 +478,7 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
473478
originalOpenshift := openshiftTests
474479
originalStorage := storageTests
475480
originalNetworkK8s := networkK8sTests
481+
originalHpa := hpaTests
476482
originalNetwork := networkTests
477483
originalBuilds := buildsTests
478484
originalMustGather := mustGatherTests
@@ -482,12 +488,13 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
482488
openshiftTests = append(openshiftTests, copyTests(originalOpenshift)...)
483489
storageTests = append(storageTests, copyTests(originalStorage)...)
484490
networkK8sTests = append(networkK8sTests, copyTests(originalNetworkK8s)...)
491+
hpaTests = append(hpaTests, copyTests(originalHpa)...)
485492
networkTests = append(networkTests, copyTests(originalNetwork)...)
486493
buildsTests = append(buildsTests, copyTests(originalBuilds)...)
487494
mustGatherTests = append(mustGatherTests, copyTests(originalMustGather)...)
488495
}
489496
}
490-
expectedTestCount += len(openshiftTests) + len(kubeTests) + len(storageTests) + len(networkK8sTests) + len(networkTests) + len(buildsTests) + len(mustGatherTests)
497+
expectedTestCount += len(openshiftTests) + len(kubeTests) + len(storageTests) + len(networkK8sTests) + len(hpaTests) + len(networkTests) + len(buildsTests) + len(mustGatherTests)
491498

492499
abortFn := neverAbort
493500
testCtx := ctx
@@ -521,6 +528,10 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
521528
q.Execute(testCtx, networkK8sTestsCopy, max(1, parallelism/2), testOutputConfig, abortFn) // run network tests separately.
522529
tests = append(tests, networkK8sTestsCopy...)
523530

531+
hpaTestsCopy := copyTests(hpaTests)
532+
q.Execute(testCtx, hpaTestsCopy, max(1, parallelism/2), testOutputConfig, abortFn) // run HPA tests separately.
533+
tests = append(tests, hpaTestsCopy...)
534+
524535
networkTestsCopy := copyTests(networkTests)
525536
q.Execute(testCtx, networkTestsCopy, max(1, parallelism/2), testOutputConfig, abortFn) // run network tests separately.
526537
tests = append(tests, networkTestsCopy...)

0 commit comments

Comments
 (0)