@@ -436,6 +436,10 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
436
436
return strings .Contains (t .name , "[sig-builds]" )
437
437
})
438
438
439
+ networkTests , openshiftTests := splitTests (openshiftTests , func (t * testCase ) bool {
440
+ return strings .Contains (t .name , "[sig-network]" )
441
+ })
442
+
439
443
mustGatherTests , openshiftTests := splitTests (openshiftTests , func (t * testCase ) bool {
440
444
return strings .Contains (t .name , "[sig-cli] oc adm must-gather" )
441
445
})
@@ -444,6 +448,7 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
444
448
logrus .Infof ("Found %d kube tests" , len (kubeTests ))
445
449
logrus .Infof ("Found %d storage tests" , len (storageTests ))
446
450
logrus .Infof ("Found %d builds tests" , len (buildsTests ))
451
+ logrus .Infof ("Found %d network tests" , len (networkTests ))
447
452
logrus .Infof ("Found %d must-gather tests" , len (mustGatherTests ))
448
453
449
454
// If user specifies a count, duplicate the kube and openshift tests that many times.
@@ -453,17 +458,19 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
453
458
originalOpenshift := openshiftTests
454
459
originalStorage := storageTests
455
460
originalBuilds := buildsTests
461
+ originalNetwork := networkTests
456
462
originalMustGather := mustGatherTests
457
463
458
464
for i := 1 ; i < count ; i ++ {
459
465
kubeTests = append (kubeTests , copyTests (originalKube )... )
460
466
openshiftTests = append (openshiftTests , copyTests (originalOpenshift )... )
461
467
storageTests = append (storageTests , copyTests (originalStorage )... )
462
468
buildsTests = append (buildsTests , copyTests (originalBuilds )... )
469
+ networkTests = append (networkTests , copyTests (originalNetwork )... )
463
470
mustGatherTests = append (mustGatherTests , copyTests (originalMustGather )... )
464
471
}
465
472
}
466
- expectedTestCount += len (openshiftTests ) + len (kubeTests ) + len (storageTests ) + len (mustGatherTests )
473
+ expectedTestCount += len (openshiftTests ) + len (kubeTests ) + len (storageTests ) + len (buildsTests ) + len ( networkTests ) + len ( mustGatherTests )
467
474
468
475
abortFn := neverAbort
469
476
testCtx := ctx
@@ -497,6 +504,10 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
497
504
q .Execute (testCtx , buildsTestsCopy , max (1 , parallelism / 2 ), testOutputConfig , abortFn ) // builds tests only run at half the parallelism, so we can avoid high cpu problems.
498
505
tests = append (tests , buildsTestsCopy ... )
499
506
507
+ networkTestsCopy := copyTests (networkTests )
508
+ q .Execute (testCtx , networkTestsCopy , max (1 , parallelism ), testOutputConfig , abortFn ) // run network tests separately.
509
+ tests = append (tests , networkTestsCopy ... )
510
+
500
511
openshiftTestsCopy := copyTests (openshiftTests )
501
512
q .Execute (testCtx , openshiftTestsCopy , parallelism , testOutputConfig , abortFn )
502
513
tests = append (tests , openshiftTestsCopy ... )
0 commit comments