Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion pkg/test/ginkgo/cmd_runsuite.go
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,10 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
return strings.Contains(t.name, "[sig-builds]")
})

imageRegistryTests, openshiftTests := splitTests(openshiftTests, func(t *testCase) bool {
return strings.Contains(t.name, "[sig-imageregistry]")
})

mustGatherTests, openshiftTests := splitTests(openshiftTests, func(t *testCase) bool {
return strings.Contains(t.name, "[sig-cli] oc adm must-gather")
})
Expand All @@ -444,6 +448,7 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
logrus.Infof("Found %d kube tests", len(kubeTests))
logrus.Infof("Found %d storage tests", len(storageTests))
logrus.Infof("Found %d builds tests", len(buildsTests))
logrus.Infof("Found %d imageregistry tests", len(imageRegistryTests))
logrus.Infof("Found %d must-gather tests", len(mustGatherTests))

// If user specifies a count, duplicate the kube and openshift tests that many times.
Expand All @@ -453,17 +458,19 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
originalOpenshift := openshiftTests
originalStorage := storageTests
originalBuilds := buildsTests
originalImageRegistry := imageRegistryTests
originalMustGather := mustGatherTests

for i := 1; i < count; i++ {
kubeTests = append(kubeTests, copyTests(originalKube)...)
openshiftTests = append(openshiftTests, copyTests(originalOpenshift)...)
storageTests = append(storageTests, copyTests(originalStorage)...)
buildsTests = append(buildsTests, copyTests(originalBuilds)...)
imageRegistryTests = append(imageRegistryTests, copyTests(originalImageRegistry)...)
mustGatherTests = append(mustGatherTests, copyTests(originalMustGather)...)
}
}
expectedTestCount += len(openshiftTests) + len(kubeTests) + len(storageTests) + len(mustGatherTests)
expectedTestCount += len(openshiftTests) + len(kubeTests) + len(storageTests) + len(buildsTests) + len(imageRegistryTests) + len(mustGatherTests)

abortFn := neverAbort
testCtx := ctx
Expand Down Expand Up @@ -497,6 +504,10 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, clusterConfig *clusterdisc
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.
tests = append(tests, buildsTestsCopy...)

imageRegistryTestsCopy := copyTests(imageRegistryTests)
q.Execute(testCtx, imageRegistryTestsCopy, max(1, parallelism), testOutputConfig, abortFn) // isolate image registry tests.
tests = append(tests, imageRegistryTestsCopy...)

openshiftTestsCopy := copyTests(openshiftTests)
q.Execute(testCtx, openshiftTestsCopy, parallelism, testOutputConfig, abortFn)
tests = append(tests, openshiftTestsCopy...)
Expand Down
2 changes: 1 addition & 1 deletion test/extended/node/zstd_chunked.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
exutil "github.com/openshift/origin/test/extended/util"
)

var _ = g.Describe("[sig-node][Feature:Builds][apigroup:build.openshift.io] zstd:chunked Image", func() {
var _ = g.Describe("[sig-builds][sig-node][Feature:Builds][apigroup:build.openshift.io] zstd:chunked Image", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("zstd-chunked-image")
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.