Skip to content

Fix network test exclusion #25581

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 4 commits into from
Oct 22, 2020
Merged

Fix network test exclusion #25581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b40adab
bump(k8s.io/kubernetes)
danwinship Oct 2, 2020
65fd0f8
Fix up and regenerate test annotations
danwinship Oct 16, 2020
099a02f
Clarify the split between o/k and o/o e2e test annotations.
danwinship Oct 9, 2020
38e841d
Belatedly un-skip two passing tests
danwinship Oct 9, 2020
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ replace (
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.2
k8s.io/kubectl => k8s.io/kubectl v0.19.0-rc.2
k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.2
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-alpha.0.0.20201002182502-db1fc96e2de2
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-alpha.0.0.20201016161205-0c1205cfae5f
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20201002182502-db1fc96e2de2
k8s.io/metrics => k8s.io/metrics v0.19.0-rc.2
k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@ github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5 h1:E6WhVL5p3rf
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5/go.mod h1:5rGmrkQ8DJEUXA+AR3rEjfH+HFyg4/apY9iCQFgvPfE=
github.com/openshift/golang-glog v0.0.0-20190322123450-3c92600d7533 h1:A5VovyRu3JFIPmC20HHrsOOny0PIdHuzDdNMULru48k=
github.com/openshift/golang-glog v0.0.0-20190322123450-3c92600d7533/go.mod h1:3sa6LKKRDnR1xy4Kn8htvPwqIOVwXh8fIU3LRY22q3U=
github.com/openshift/kubernetes v1.20.0-alpha.0.0.20201002182502-db1fc96e2de2 h1:x/2vWJIoM+0SwZ0RCbq3ku/wcUCqVE7nZSmETCD+5MI=
github.com/openshift/kubernetes v1.20.0-alpha.0.0.20201002182502-db1fc96e2de2/go.mod h1:thZ+fVBomGpLqnFpgVP7zLoR1cZr5ceY0Ccrrw5DUPc=
github.com/openshift/kubernetes v1.20.0-alpha.0.0.20201016161205-0c1205cfae5f h1:jGEt6NH6La0mJ/pk1juZJP8ie7s52g3YQDuDUCQtqqo=
github.com/openshift/kubernetes v1.20.0-alpha.0.0.20201016161205-0c1205cfae5f/go.mod h1:thZ+fVBomGpLqnFpgVP7zLoR1cZr5ceY0Ccrrw5DUPc=
github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20201002182502-db1fc96e2de2 h1:vlFNN8ayuvc1PmQhxAEKAQNYR4/kTOOSj1v4fjSD0vE=
github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20201002182502-db1fc96e2de2/go.mod h1:wR/2WpnpEiQEhbGJyD7pRwxVsSEW4H3QKgvH4LBr97I=
github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20201002182502-db1fc96e2de2 h1:+0/vXRKjOcS28ZdtTsEnuY/AFbwxMIAa8ym0d9dLiek=
Expand Down
26 changes: 13 additions & 13 deletions test/extended/util/annotate/generated/zz_generated.annotations.go
View file
Open in desktop

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

21 changes: 13 additions & 8 deletions test/extended/util/annotate/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package main

// NOTE: Only annotation rules targeting tests implemented in origin
// should be added to this file.
//
// Rules defined here are additive to the rules already defined for
// kube e2e tests in openshift/kubernetes. The kube rules are
// vendored via the following file:
//
// vendor/k8s.io/kubernetes/openshift-hack/e2e/annotate/rules.go
//
// Changes to rules for kube e2e tests should be proposed to
// openshift/kubernetes and vendored back into origin.
// Rules that are needed to pass the upstream e2e test suite in a
// "default OCP CI" configuration (eg, AWS or GCP, openshift-sdn) must
// be added to openshift/kubernetes to allow CI to pass there, and
// then vendored back into origin. Rules that only apply to
// "non-default" configurations (other clouds, other network
// providers) should be added here.

var (
testMaps = map[string][]string{
Expand Down Expand Up @@ -50,10 +51,13 @@ var (
`\[sig-network\] Networking Granular Checks: Services should function for pod-Service`,
},
"[Skipped:gce]": {},

// tests that don't pass under openshift-sdn NetworkPolicy mode are specified
// in the rules file in openshift/kubernetes, not here.

// tests that don't pass under openshift-sdn multitenant mode
"[Skipped:Network/OpenShiftSDN/Multitenant]": {
`\[Feature:NetworkPolicy\]`, // not compatible with multitenant mode
`\[sig-network\] Services should preserve source pod IP for traffic thru service cluster IP`, // known bug, not planned to be fixed
},
// tests that don't pass under OVN Kubernetes
"[Skipped:Network/OVNKubernetes]": {
Expand All @@ -66,8 +70,9 @@ var (
`\[sig-network\] Services should have session affinity work for service with type clusterIP`,
`\[sig-network\] Services should have session affinity timeout work for NodePort service`,
`\[sig-network\] Services should have session affinity timeout work for service with type clusterIP`,
// https://github.com/kubernetes/kubernetes/pull/93597: upstream is flaky
`\[sig-network\] Conntrack should be able to preserve UDP traffic when server pod cycles for a NodePort service`,

// ovn-kubernetes does not support named ports
`NetworkPolicy.*named port`,
},
"[Skipped:ibmcloud]": {
// skip Gluster tests (not supported on ROKS worker nodes)
Expand Down
2 changes: 1 addition & 1 deletion vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go
View file
Open in desktop

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

Loading