Skip to content
Merged
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
22 changes: 11 additions & 11 deletions openshift-hack/e2e/annotate/generated/zz_generated.annotations.go

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

21 changes: 11 additions & 10 deletions openshift-hack/e2e/annotate/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,7 @@ var (
`Ubernetes`, // Can't set zone labels today
`kube-ui`, // Not installed by default
`Kubernetes Dashboard`, // Not installed by default (also probably slow image pull)

`NetworkPolicy.*egress`, // not supported
`NetworkPolicy.*named port`, // not yet implemented
`enforce egress policy`, // not support
`should proxy to cadvisor`, // we don't expose cAdvisor port directly for security reasons

`NetworkPolicy.*IPBlock`, // not supported
`NetworkPolicy.*Egress`, // not supported
`NetworkPolicy.*default-deny-all`, // not supported
`should proxy to cadvisor`, // we don't expose cAdvisor port directly for security reasons
},
// tests that rely on special configuration that we do not yet support
"[Disabled:SpecialConfig]": {
Expand Down Expand Up @@ -72,7 +64,6 @@ var (
`should check kube-proxy urls`, // previously this test was skipped b/c we reported -1 as the number of nodes, now we report proper number and test fails
`SSH`, // TRIAGE
`should implement service.kubernetes.io/service-proxy-name`, // this is an optional test that requires SSH. sig-network
`should allow ingress access on one named port`, // https://bugzilla.redhat.com/show_bug.cgi?id=1711602
`recreate nodes and ensure they function upon restart`, // https://bugzilla.redhat.com/show_bug.cgi?id=1756428
`\[Driver: iscsi\]`, // https://bugzilla.redhat.com/show_bug.cgi?id=1711627

Expand Down Expand Up @@ -183,6 +174,16 @@ var (
`\[Feature:GKELocalSSD\]`,
`\[Feature:GKENodePool\]`,
},
// Tests that don't pass under openshift-sdn.
// These are skipped explicitly by openshift-hack/test-kubernetes-e2e.sh,
// but will also be skipped by openshift-tests in jobs that use openshift-sdn.
"[Skipped:Network/OpenShiftSDN]": {
`NetworkPolicy.*IPBlock`, // feature is not supported by openshift-sdn
`NetworkPolicy.*[Ee]gress`, // feature is not supported by openshift-sdn
`NetworkPolicy.*named port`, // feature is not supported by openshift-sdn

`NetworkPolicy between server and client should support a 'default-deny-all' policy`, // uses egress feature
},
}

// labelExcludes temporarily block tests out of a specific suite
Expand Down
2 changes: 1 addition & 1 deletion openshift-hack/test-kubernetes-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ esac

# Support serial and parallel test suites
TEST_SUITE="${TEST_SUITE:-parallel}"
COMMON_SKIPS="\[Slow\]|\[Disruptive\]|\[Flaky\]|\[Disabled:.+\]|\[Skipped:${PLATFORM}\]"
COMMON_SKIPS="\[Slow\]|\[Disruptive\]|\[Flaky\]|\[Disabled:.+\]|\[Skipped:${PLATFORM}\]|\[Skipped:Network/OpenShiftSDN\]"
case "${TEST_SUITE}" in
serial)
DEFAULT_TEST_ARGS="-focus=\[Serial\] -skip=${COMMON_SKIPS}"
Expand Down
Loading