Skip to content

Commit 168894d

Browse files
smarterclaytonsmarterclayton
committed
Enable upstream tests
1 parent 4ca6e96 commit 168894d

File tree

2 files changed

+152
-121
lines changed

2 files changed

+152
-121
lines changed

‎test/extended/extended_test.go

+19
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,25 @@ import (
55

66
_ "k8s.io/kubernetes/test/e2e"
77

8+
// test sources
9+
_ "k8s.io/kubernetes/test/e2e/apimachinery"
10+
_ "k8s.io/kubernetes/test/e2e/apps"
11+
_ "k8s.io/kubernetes/test/e2e/auth"
12+
_ "k8s.io/kubernetes/test/e2e/autoscaling"
13+
_ "k8s.io/kubernetes/test/e2e/common"
14+
_ "k8s.io/kubernetes/test/e2e/instrumentation"
15+
_ "k8s.io/kubernetes/test/e2e/kubectl"
16+
// _ "k8s.io/kubernetes/test/e2e/lifecycle"
17+
// _ "k8s.io/kubernetes/test/e2e/lifecycle/bootstrap"
18+
// _ "k8s.io/kubernetes/test/e2e/multicluster"
19+
_ "k8s.io/kubernetes/test/e2e/network"
20+
_ "k8s.io/kubernetes/test/e2e/node"
21+
_ "k8s.io/kubernetes/test/e2e/scalability"
22+
_ "k8s.io/kubernetes/test/e2e/scheduling"
23+
_ "k8s.io/kubernetes/test/e2e/servicecatalog"
24+
_ "k8s.io/kubernetes/test/e2e/storage"
25+
// _ "k8s.io/kubernetes/test/e2e/ui"
26+
827
_ "github.com/openshift/origin/test/extended/builds"
928
_ "github.com/openshift/origin/test/extended/cli"
1029
_ "github.com/openshift/origin/test/extended/cluster"

‎test/extended/util/test.go

+133-121
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,35 @@ func ExecuteTest(t *testing.T, suite string) {
126126
r = append(r, reporters.NewJUnitReporter(path.Join(reportDir, fmt.Sprintf("%s_%02d.xml", reportFileName, config.GinkgoConfig.ParallelNode))))
127127
}
128128

129+
matches := make(map[string]*regexp.Regexp)
130+
for label, items := range testMaps {
131+
matches[label] = regexp.MustCompile(strings.Join(items, `|`))
132+
}
133+
129134
ginkgo.WalkTests(func(name string, node types.TestNode) {
130-
isSerial := serialTestsFilter.MatchString(name)
131-
if isSerial {
132-
if !strings.Contains(name, "[Serial]") {
133-
node.SetText(node.Text() + " [Serial]")
135+
labels := ""
136+
for {
137+
count := 0
138+
for label, matcher := range matches {
139+
if strings.Contains(name, label) {
140+
continue
141+
}
142+
if matcher.MatchString(name) {
143+
count++
144+
labels += " " + label
145+
name += " " + label
146+
}
147+
}
148+
if count == 0 {
149+
break
134150
}
135151
}
136-
152+
isSerial := strings.Contains(name, "[Serial]")
137153
if !excludedTestsFilter.MatchString(name) {
138-
include := conformanceTestsFilter.MatchString(name)
139154
switch {
140-
case !include:
141-
// do nothing
142155
case isSerial:
143156
node.SetText(node.Text() + " [Suite:openshift/conformance/serial]")
144-
case include:
157+
default:
145158
node.SetText(node.Text() + " [Suite:openshift/conformance/parallel]")
146159
}
147160
}
@@ -151,6 +164,7 @@ func ExecuteTest(t *testing.T, suite string) {
151164
if strings.Contains(node.CodeLocation().FileName, "/kubernetes/test/e2e/") {
152165
node.SetText(node.Text() + " [Suite:k8s]")
153166
}
167+
node.SetText(node.Text() + labels)
154168
})
155169

156170
if quiet {
@@ -248,126 +262,124 @@ func createTestingNS(baseName string, c kclientset.Interface, labels map[string]
248262
}
249263

250264
var (
265+
testMaps = map[string][]string{
266+
// tests that require a local host
267+
"[Local]": {
268+
// Doesn't work on scaled up clusters
269+
`\[Feature:ImagePrune\]`,
270+
},
271+
// alpha features that are not gated
272+
"[Disabled:Alpha]": {
273+
`\[Feature:Initializers\]`, // admission controller disabled
274+
`\[Feature:LocalPersistentVolumes\]`, // flag gate is off
275+
`\[Feature:PodPreemption\]`, // flag gate is off
276+
`AdmissionWebhook`, // needs to be enabled
277+
},
278+
// tests for features that are not implemented in openshift
279+
"[Disabled:Unimplemented]": {
280+
`\[Feature:Networking-IPv6\]`, // openshift-sdn doesn't support yet
281+
`Monitoring`, // Not installed, should be
282+
`Cluster level logging`, // Not installed yet
283+
`Kibana`, // Not installed
284+
`Ubernetes`, // Can't set zone labels today
285+
`kube-ui`, // Not installed by default
286+
`^Kubernetes Dashboard`, // Not installed by default (also probably slow image pull)
287+
`Ingress`, // Not enabled yet
288+
289+
`NetworkPolicy between server and client should allow egress access on one named port`, // not yet implemented
290+
291+
`should proxy to cadvisor`, // we don't expose cAdvisor port directly for security reasons
292+
},
293+
// tests that rely on special configuration that we do not yet support
294+
"[Disabled:SpecialConfig]": {
295+
`\[Feature:ImageQuota\]`, // Quota isn't turned on by default, we should do that and then reenable these tests
296+
`\[Feature:Audit\]`, // Needs special configuration
297+
`\[Feature:LocalStorageCapacityIsolation\]`, // relies on a separate daemonset?
298+
299+
`kube-dns-autoscaler`, // Don't run kube-dns
300+
`should check if Kubernetes master services is included in cluster-info`, // Don't run kube-dns
301+
`DNS configMap`, // this tests dns federation configuration via configmap, which we don't support yet
302+
303+
// vSphere tests can be skipped generally
304+
`vsphere`,
305+
`Cinder`, // requires an OpenStack cluster
306+
// See the CanSupport implementation in upstream to determine wether these work.
307+
`Ceph RBD`, // Works if ceph-common Binary installed (but we can't guarantee this on all clusters).
308+
`GlusterFS`, // May work if /sbin/mount.glusterfs to be installed for plugin to work (also possibly blocked by serial pulling)
309+
`Horizontal pod autoscaling`, // needs heapster
310+
`authentication: OpenLDAP`, // needs separate setup and bucketing for openldap bootstrapping
311+
`NodeProblemDetector`, // requires a non-master node to run on
312+
`Advanced Audit should audit API calls`, // expects to be able to call /logs
313+
314+
`Metadata Concealment`, // TODO: would be good to use
315+
316+
`Firewall rule should have correct firewall rules for e2e cluster`, // Upstream-install specific
317+
},
318+
// tests that are known broken and need to be fixed upstream or in openshift
319+
// always add an issue here
320+
"[Disabled:Broken]": {
321+
`\[Feature:Example\]`, // has cleanup issues
322+
`mount an API token into pods`, // We add 6 secrets, not 1
323+
`ServiceAccounts should ensure a single API token exists`, // We create lots of secrets
324+
`should test kube-proxy`, // needs 2 nodes
325+
`unchanging, static URL paths for kubernetes api services`, // the test needs to exclude URLs that are not part of conformance (/logs)
326+
"PersistentVolumes NFS when invoking the Recycle reclaim policy", // failing for some reason
327+
`should propagate mounts to the host`, // https://github.com/openshift/origin/issues/18931
328+
`Simple pod should handle in-cluster config`, // kubectl cp is not preserving executable bit
329+
`Services should be able to up and down services`, // we don't have wget installed on nodes
330+
`Network should set TCP CLOSE_WAIT timeout`, // possibly some difference between ubuntu and fedora
331+
`should allow ingress access on one named port`, // broken even with network policy on
332+
333+
`validates that there is no conflict between pods with same hostPort but different hostIP and protocol`, // https://github.com/kubernetes/kubernetes/issues/61018
334+
335+
`SSH`, // TRIAGE
336+
`SELinux relabeling`, // https://github.com/openshift/origin/issues/7287 still broken
337+
`Volumes CephFS`, // permission denied, selinux?
338+
339+
`should idle the service and DeploymentConfig properly`, // idling with a single service and DeploymentConfig [Conformance]
340+
},
341+
// tests too slow to be part of conformance
342+
"[Slow]": {
343+
`\[sig-scalability\]`, // disable from the default set for now
344+
`should create and stop a working application`, // Inordinately slow tests
345+
346+
`should ensure that critical pod is scheduled in case there is no resources available`, // should be tagged disruptive, consumes 100% of cluster CPU
347+
348+
"Pod should avoid to schedule to node that have avoidPod annotation",
349+
"Pod should be schedule to node that satisify the PodAffinity",
350+
"Pod should be prefer scheduled to node that satisify the NodeAffinity",
351+
"Pod should be schedule to node that don't match the PodAntiAffinity terms", // 2m
352+
353+
"validates that there exists conflict between pods with same hostPort and protocol but one using 0.0.0.0 hostIP", // 5m, really?
354+
},
355+
// tests that are known flaky
356+
"[Flaky]": {
357+
`Job should run a job to completion when tasks sometimes fail and are not locally restarted`, // seems flaky, also may require too many resources
358+
`openshift mongodb replication creating from a template`, // flaking on deployment
359+
},
360+
// tests that must be run without competition
361+
"[Serial]": {
362+
`\[Disruptive\]`,
363+
`\[Feature:Performance\]`, // requires isolation
364+
`\[Feature:ManualPerformance\]`, // requires isolation
365+
`\[Feature:HighDensityPerformance\]`, // requires no other namespaces
366+
367+
`Service endpoints latency`, // requires low latency
368+
`Clean up pods on node`, // schedules up to max pods per node
369+
`should allow starting 95 pods per node`,
370+
},
371+
}
372+
251373
excludedTests = []string{
374+
`\[Disabled:.+\]`,
252375
`\[Skipped\]`,
253376
`\[Slow\]`,
254377
`\[Flaky\]`,
255378
`\[Disruptive\]`,
256379
`\[local\]`,
257-
258-
// not enabled in Origin yet
259-
//`\[Feature:GarbageCollector\]`,
260-
261-
// Doesn't work on scaled up clusters
262-
`\[Feature:ImagePrune\]`,
263-
// Quota isn't turned on by default, we should do that and then reenable these tests
264-
`\[Feature:ImageQuota\]`,
265-
// Currently disabled by default
266-
`\[Feature:Initializers\]`,
267-
// Needs special configuration
268-
`\[Feature:Audit\]`,
269-
270-
// Depends on external components, may not need yet
271-
`Monitoring`, // Not installed, should be
272-
`Cluster level logging`, // Not installed yet
273-
`Kibana`, // Not installed
274-
`Ubernetes`, // Can't set zone labels today
275-
`kube-ui`, // Not installed by default
276-
`^Kubernetes Dashboard`, // Not installed by default (also probably slow image pull)
277-
278-
`\[Feature:Federation\]`, // Not enabled yet
279-
`\[Feature:Federation12\]`, // Not enabled yet
280-
`Ingress`, // Not enabled yet
281-
`Cinder`, // requires an OpenStack cluster
282-
`should support r/w`, // hostPath: This test expects that host's tmp dir is WRITABLE by a container. That isn't something we need to guarantee for openshift.
283-
`should check that the kubernetes-dashboard instance is alive`, // we don't create this
284-
// `\[Feature:ManualPerformance\]`, // requires /resetMetrics which we don't expose
285-
286-
// See the CanSupport implementation in upstream to determine wether these work.
287-
`Ceph RBD`, // Works if ceph-common Binary installed (but we can't guarantee this on all clusters).
288-
`GlusterFS`, // May work if /sbin/mount.glusterfs to be installed for plugin to work (also possibly blocked by serial pulling)
289-
`should support r/w`, // hostPath: This test expects that host's tmp dir is WRITABLE by a container. That isn't something we need to guarantee for openshift.
290-
291-
// Failing because of https://github.com/openshift/origin/issues/12365 against a real cluster
292-
//`should allow starting 95 pods per node`,
293-
294-
// Need fixing
295-
`Horizontal pod autoscaling`, // needs heapster
296-
//`PersistentVolume`, // https://github.com/openshift/origin/pull/6884 for recycler
297-
`mount an API token into pods`, // We add 6 secrets, not 1
298-
`ServiceAccounts should ensure a single API token exists`, // We create lots of secrets
299-
`should test kube-proxy`, // needs 2 nodes
300-
`authentication: OpenLDAP`, // needs separate setup and bucketing for openldap bootstrapping
301-
`NFS`, // no permissions https://github.com/openshift/origin/pull/6884
302-
`\[Feature:Example\]`, // has cleanup issues
303-
`NodeProblemDetector`, // requires a non-master node to run on
304-
//`unchanging, static URL paths for kubernetes api services`, // the test needs to exclude URLs that are not part of conformance (/logs)
305-
306-
// Needs triage to determine why it is failing
307-
`Addon update`, // TRIAGE
308-
`SSH`, // TRIAGE
309-
`\[Feature:Upgrade\]`, // TRIAGE
310-
`SELinux relabeling`, // https://github.com/openshift/origin/issues/7287
311-
`openshift mongodb replication creating from a template`, // flaking on deployment
312-
//`Update Demo should do a rolling update of a replication controller`, // this is flaky and needs triaging
313-
314-
// Test will never work
315-
`should proxy to cadvisor`, // we don't expose cAdvisor port directly for security reasons
316-
317-
// Need to relax security restrictions
318-
//`validates that InterPod Affinity and AntiAffinity is respected if matching`, // this *may* now be safe
319-
320-
// Requires too many pods per node for the per core defaults
321-
//`should ensure that critical pod is scheduled in case there is no resources available`,
322-
323-
// Need multiple nodes
324-
`validates that InterPodAntiAffinity is respected if matching 2`,
325-
326-
// Inordinately slow tests
327-
`should create and stop a working application`,
328-
//`should always delete fast`, // will be uncommented in etcd3
329-
330-
// We don't install KubeDNS
331-
`should check if Kubernetes master services is included in cluster-info`,
332-
333-
// this tests dns federation configuration via configmap, which we don't support yet
334-
`DNS configMap`,
335-
336-
// this tests the _kube_ downgrade. we don't support that.
337-
`\[Feature:Downgrade\]`,
338-
339-
// upstream flakes
340-
`validates resource limits of pods that are allowed to run`, // can't schedule to master due to node label limits, also fiddly
341-
342-
// TODO undisable:
343-
`should provide basic identity`, // needs a persistent volume provisioner in single node, host path not working
344-
`should idle the service and DeploymentConfig properly`, // idling with a single service and DeploymentConfig [Conformance]
345-
346-
// slow as sin and twice as ugly (11m each)
347-
"Pod should avoid to schedule to node that have avoidPod annotation",
348-
"Pod should be schedule to node that satisify the PodAffinity",
349-
"Pod should be prefer scheduled to node that satisify the NodeAffinity",
380+
`\[Local\]`,
350381
}
351382
excludedTestsFilter = regexp.MustCompile(strings.Join(excludedTests, `|`))
352-
353-
// The list of tests to run for the OpenShift conformance suite. Any test
354-
// in this group which cannot be run in parallel must be identified with the
355-
// [Serial] tag or added to the serialTests filter.
356-
conformanceTests = []string{}
357-
conformanceTestsFilter = regexp.MustCompile(strings.Join(conformanceTests, `|`))
358-
359-
// Identifies any tests that by nature must be run in isolation. Every test in this
360-
// category will be given the [Serial] tag if it does not already have it.
361-
serialTests = []string{
362-
`\[Serial\]`,
363-
`\[Disruptive\]`,
364-
`\[Feature:ManualPerformance\]`, // requires isolation
365-
`\[Feature:HighDensityPerformance\]`, // requires no other namespaces
366-
`Service endpoints latency`, // requires low latency
367-
`Clean up pods on node`, // schedules up to max pods per node
368-
`should allow starting 95 pods per node`,
369-
}
370-
serialTestsFilter = regexp.MustCompile(strings.Join(serialTests, `|`))
371383
)
372384

373385
// checkSyntheticInput selects tests based on synthetic skips or focuses

0 commit comments

Comments
 (0)