Skip to content

Commit e3e96cb

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

File tree

2 files changed

+70
-47
lines changed

2 files changed

+70
-47
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

+51-47
Original file line numberDiff line numberDiff line change
@@ -254,18 +254,32 @@ var (
254254
`\[Flaky\]`,
255255
`\[Disruptive\]`,
256256
`\[local\]`,
257-
258-
// not enabled in Origin yet
259-
//`\[Feature:GarbageCollector\]`,
257+
`\[Local\]`,
260258

261259
// Doesn't work on scaled up clusters
262260
`\[Feature:ImagePrune\]`,
263261
// Quota isn't turned on by default, we should do that and then reenable these tests
264262
`\[Feature:ImageQuota\]`,
265-
// Currently disabled by default
266-
`\[Feature:Initializers\]`,
267263
// Needs special configuration
268264
`\[Feature:Audit\]`,
265+
// has cleanup issues
266+
`\[Feature:Example\]`,
267+
// admission controller disabled
268+
`\[Feature:Initializers\]`,
269+
// openshift-sdn doesn't support yet
270+
`\[Feature:Networking-IPv6\]`,
271+
// disable from the default set for now
272+
`\[sig-scalability\]`,
273+
// relies on a separate daemonset?
274+
`\[Feature:LocalStorageCapacityIsolation\]`,
275+
// flag gate is off
276+
`\[Feature:LocalPersistentVolumes\]`,
277+
278+
// Don't run kube-dns
279+
`kube-dns-autoscaler`,
280+
281+
// vSphere tests can be skipped generally
282+
`vsphere`,
269283

270284
// Depends on external components, may not need yet
271285
`Monitoring`, // Not installed, should be
@@ -275,78 +289,67 @@ var (
275289
`kube-ui`, // Not installed by default
276290
`^Kubernetes Dashboard`, // Not installed by default (also probably slow image pull)
277291

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
292+
`Ingress`, // Not enabled yet
293+
`Cinder`, // requires an OpenStack cluster
285294

286295
// 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.
296+
`Ceph RBD`, // Works if ceph-common Binary installed (but we can't guarantee this on all clusters).
297+
`GlusterFS`, // May work if /sbin/mount.glusterfs to be installed for plugin to work (also possibly blocked by serial pulling)
290298

291-
// Failing because of https://github.com/openshift/origin/issues/12365 against a real cluster
292-
//`should allow starting 95 pods per node`,
299+
`NetworkPolicy between server and client should allow egress access on one named port`, // not yet implemented
293300

294301
// 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)
302+
`Horizontal pod autoscaling`, // needs heapster
303+
`mount an API token into pods`, // We add 6 secrets, not 1
304+
`ServiceAccounts should ensure a single API token exists`, // We create lots of secrets
305+
`should test kube-proxy`, // needs 2 nodes
306+
`authentication: OpenLDAP`, // needs separate setup and bucketing for openldap bootstrapping
307+
`NodeProblemDetector`, // requires a non-master node to run on
308+
`unchanging, static URL paths for kubernetes api services`, // the test needs to exclude URLs that are not part of conformance (/logs)
309+
"PersistentVolumes NFS when invoking the Recycle reclaim policy", // failing for some reason
310+
`should propagate mounts to the host`, // https://github.com/openshift/origin/issues/18931
311+
`AdmissionWebhook`, // needs to be enabled
312+
`Advanced Audit should audit API calls`, // expects to be able to call /logs
313+
`Simple pod should handle in-cluster config`, // kubectl cp is not preserving executable bit
314+
`Services should be able to up and down services`, // we don't have wget installed on nodes
315+
`Network should set TCP CLOSE_WAIT timeout`, // possibly some difference between ubuntu and fedora
316+
`should allow ingress access on one named port`, // broken even with network policy on
305317

306318
// 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
319+
`SSH`, // TRIAGE
320+
`SELinux relabeling`, // https://github.com/openshift/origin/issues/7287 still broken
311321
`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
322+
`Volumes CephFS`, // permission denied, selinux?
313323

314324
// Test will never work
315325
`should proxy to cadvisor`, // we don't expose cAdvisor port directly for security reasons
316326

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-
326327
// Inordinately slow tests
327328
`should create and stop a working application`,
328-
//`should always delete fast`, // will be uncommented in etcd3
329329

330330
// We don't install KubeDNS
331331
`should check if Kubernetes master services is included in cluster-info`,
332332

333333
// this tests dns federation configuration via configmap, which we don't support yet
334334
`DNS configMap`,
335335

336-
// this tests the _kube_ downgrade. we don't support that.
337-
`\[Feature:Downgrade\]`,
338-
339336
// 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
337+
// `validates resource limits of pods that are allowed to run`, // can't schedule to master due to node label limits, also fiddly
341338

342339
// TODO undisable:
343-
`should provide basic identity`, // needs a persistent volume provisioner in single node, host path not working
340+
// `should provide basic identity`, // needs a persistent volume provisioner in single node, host path not working
344341
`should idle the service and DeploymentConfig properly`, // idling with a single service and DeploymentConfig [Conformance]
345342

343+
// TODO: would be good to use
344+
`Metadata Concealment`,
345+
346346
// slow as sin and twice as ugly (11m each)
347347
"Pod should avoid to schedule to node that have avoidPod annotation",
348348
"Pod should be schedule to node that satisify the PodAffinity",
349349
"Pod should be prefer scheduled to node that satisify the NodeAffinity",
350+
351+
// Upstream-install specific
352+
`Firewall rule should have correct firewall rules for e2e cluster`,
350353
}
351354
excludedTestsFilter = regexp.MustCompile(strings.Join(excludedTests, `|`))
352355

@@ -361,6 +364,7 @@ var (
361364
serialTests = []string{
362365
`\[Serial\]`,
363366
`\[Disruptive\]`,
367+
`\[Feature:Performance\]`, // requires isolation
364368
`\[Feature:ManualPerformance\]`, // requires isolation
365369
`\[Feature:HighDensityPerformance\]`, // requires no other namespaces
366370
`Service endpoints latency`, // requires low latency

0 commit comments

Comments
 (0)