Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wip] Remove retry #29363

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
20 changes: 17 additions & 3 deletions pkg/testsuites/standard_suites.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,28 @@ var staticSuites = []ginkgo.TestSuite{
Description: templates.LongDesc(`
Only the portion of the openshift/conformance test suite that run in parallel.
`),
Matches: func(name string) bool {
if isDisabled(name) {
return false
}
return strings.Contains(name, "[Suite:openshift/conformance/parallel") && !strings.Contains(name, "[OCPFlaky]")
},
Parallelism: 30,
MaximumAllowedFlakes: 0,
},
{
Name: "openshift/conformance/ocp-flaky",
Description: templates.LongDesc(`
Our flaky tests plus the portion of the openshift/conformance test suite that run in parallel.
`),
Matches: func(name string) bool {
if isDisabled(name) {
return false
}
return strings.Contains(name, "[Suite:openshift/conformance/parallel")
},
Parallelism: 30,
MaximumAllowedFlakes: 15,
MaximumAllowedFlakes: 0,
},
{
Name: "openshift/conformance/serial",
Expand Down Expand Up @@ -116,7 +130,7 @@ var staticSuites = []ginkgo.TestSuite{
},
Parallelism: 7,
// TODO: Builds are really flaky right now, remove when we land perf updates and fix io on workers
MaximumAllowedFlakes: 3,
MaximumAllowedFlakes: 0,
// Jenkins tests can take a really long time
TestTimeout: 60 * time.Minute,
},
Expand Down Expand Up @@ -339,7 +353,7 @@ var staticSuites = []ginkgo.TestSuite{
return !isDisabled(name) && strings.Contains(name, "[Suite:openshift/conformance/parallel")
},
Parallelism: 20,
MaximumAllowedFlakes: 15,
MaximumAllowedFlakes: 0,
},
{
Name: "all",
Expand Down
2 changes: 1 addition & 1 deletion test/extended/networking/network_segmentation.go
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ var _ = Describe("[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:User
),
)
DescribeTable(
"isolates overlapping CIDRs",
"isolates overlapping CIDRs [OCPFlaky]",
func(
topology string,
numberOfPods int,
Expand Down

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

8 changes: 4 additions & 4 deletions zz_generated.manifests/test-reporting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ spec:
is isolated from the default network with L3 primary UDN'
- testName: '[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks]
when using openshift ovn-kubernetes created using NetworkAttachmentDefinitions
isolates overlapping CIDRs with L2 primary UDN'
isolates overlapping CIDRs [OCPFlaky] with L2 primary UDN'
- testName: '[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks]
when using openshift ovn-kubernetes created using NetworkAttachmentDefinitions
isolates overlapping CIDRs with L3 primary UDN'
isolates overlapping CIDRs [OCPFlaky] with L3 primary UDN'
- testName: '[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks]
when using openshift ovn-kubernetes created using UserDefinedNetwork can perform
east/west traffic between nodes for two pods connected over a L2 primary UDN'
Expand All @@ -237,10 +237,10 @@ spec:
from the default network with L3 primary UDN'
- testName: '[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks]
when using openshift ovn-kubernetes created using UserDefinedNetwork isolates
overlapping CIDRs with L2 primary UDN'
overlapping CIDRs [OCPFlaky] with L2 primary UDN'
- testName: '[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks]
when using openshift ovn-kubernetes created using UserDefinedNetwork isolates
overlapping CIDRs with L3 primary UDN'
overlapping CIDRs [OCPFlaky] with L3 primary UDN'
- testName: '[sig-network][OCPFeatureGate:NetworkSegmentation][Feature:UserDefinedPrimaryNetworks]
when using openshift ovn-kubernetes when primary network exist, UserDefinedNetwork
status should report not-ready'
Expand Down