Skip to content

Commit 107635b

Browse files
committed
NO-JIRA: Separate node tests
1 parent 9678a30 commit 107635b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pkg/test/ginkgo/cmd_runsuite.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,8 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
447447
return strings.Contains(t.name, "[sig-storage]")
448448
})
449449

450-
hpaTests, openshiftTests := splitTests(openshiftTests, func(t *testCase) bool {
451-
return strings.Contains(t.name, "[Feature:HPA]")
450+
nodeTests, openshiftTests := splitTests(openshiftTests, func(t *testCase) bool {
451+
return strings.Contains(t.name, "[sig-node]")
452452
})
453453

454454
networkTests, openshiftTests := splitTests(openshiftTests, func(t *testCase) bool {
@@ -465,7 +465,7 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
465465

466466
logrus.Infof("Found %d openshift tests", len(openshiftTests))
467467
logrus.Infof("Found %d storage tests", len(storageTests))
468-
logrus.Infof("Found %d HPA tests", len(hpaTests))
468+
logrus.Infof("Found %d node tests", len(nodeTests))
469469
logrus.Infof("Found %d network tests", len(networkTests))
470470
logrus.Infof("Found %d builds tests", len(buildsTests))
471471
logrus.Infof("Found %d must-gather tests", len(mustGatherTests))
@@ -475,21 +475,21 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
475475
if count != -1 {
476476
originalOpenshift := openshiftTests
477477
originalStorage := storageTests
478-
originalHpa := hpaTests
478+
originalNode := nodeTests
479479
originalNetwork := networkTests
480480
originalBuilds := buildsTests
481481
originalMustGather := mustGatherTests
482482

483483
for i := 1; i < count; i++ {
484484
openshiftTests = append(openshiftTests, copyTests(originalOpenshift)...)
485485
storageTests = append(storageTests, copyTests(originalStorage)...)
486-
hpaTests = append(hpaTests, copyTests(originalHpa)...)
486+
nodeTests = append(nodeTests, copyTests(originalNode)...)
487487
networkTests = append(networkTests, copyTests(originalNetwork)...)
488488
buildsTests = append(buildsTests, copyTests(originalBuilds)...)
489489
mustGatherTests = append(mustGatherTests, copyTests(originalMustGather)...)
490490
}
491491
}
492-
expectedTestCount += len(openshiftTests) + len(storageTests) + len(hpaTests) + len(networkTests) + len(buildsTests) + len(mustGatherTests)
492+
expectedTestCount += len(openshiftTests) + len(storageTests) + len(nodeTests) + len(networkTests) + len(buildsTests) + len(mustGatherTests)
493493

494494
abortFn := neverAbort
495495
testCtx := ctx
@@ -516,9 +516,9 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
516516
q.Execute(testCtx, storageTestsCopy, max(1, parallelism/2), testOutputConfig, abortFn) // storage tests only run at half the parallelism, so we can avoid cloud provider quota problems.
517517
tests = append(tests, storageTestsCopy...)
518518

519-
hpaTestsCopy := copyTests(hpaTests)
520-
q.Execute(testCtx, hpaTestsCopy, max(1, parallelism/2), testOutputConfig, abortFn) // run HPA tests separately.
521-
tests = append(tests, hpaTestsCopy...)
519+
nodeTestsCopy := copyTests(nodeTests)
520+
q.Execute(testCtx, nodeTestsCopy, max(1, parallelism/2), testOutputConfig, abortFn) // run node tests separately at half the parallelism, so we can avoid high cpu problems.
521+
tests = append(tests, nodeTestsCopy...)
522522

523523
networkTestsCopy := copyTests(networkTests)
524524
q.Execute(testCtx, networkTestsCopy, max(1, parallelism/2), testOutputConfig, abortFn) // run network tests separately.

0 commit comments

Comments
 (0)