Skip to content

Commit 1b3322e

Browse files
smarterclaytonsmarterclayton
committed
Enable upstream tests
1 parent 63e0cde commit 1b3322e

File tree

2 files changed

+45
-29
lines changed

2 files changed

+45
-29
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

+26-29
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,9 @@ func createTestingNS(baseName string, c kclientset.Interface, labels map[string]
239239
return ns, err
240240
}
241241
addRoleToE2EServiceAccounts(authorizationClient, []kapiv1.Namespace{*ns}, bootstrappolicy.ViewRoleName)
242+
243+
// in practice too many kube tests ignore scheduling constraints
244+
allowAllNodeScheduling(c, ns.Name)
242245
}
243246

244247
// some tests assume they can schedule to all nodes
@@ -264,10 +267,18 @@ var (
264267
`\[Feature:ImagePrune\]`,
265268
// Quota isn't turned on by default, we should do that and then reenable these tests
266269
`\[Feature:ImageQuota\]`,
267-
// Currently disabled by default
268-
`\[Feature:Initializers\]`,
269270
// Needs special configuration
270271
`\[Feature:Audit\]`,
272+
// has cleanup issues
273+
`\[Feature:Example\]`,
274+
275+
// May be too expensive
276+
// `\[Feature:ManualPerformance\]`,
277+
// Don't run kube-dns
278+
`kube-dns-autoscaler`,
279+
280+
// vSphere tests can be skipped generally
281+
`vsphere`,
271282

272283
// Depends on external components, may not need yet
273284
`Monitoring`, // Not installed, should be
@@ -277,18 +288,13 @@ var (
277288
`kube-ui`, // Not installed by default
278289
`^Kubernetes Dashboard`, // Not installed by default (also probably slow image pull)
279290

280-
`\[Feature:Federation\]`, // Not enabled yet
281-
`\[Feature:Federation12\]`, // Not enabled yet
282-
`Ingress`, // Not enabled yet
283-
`Cinder`, // requires an OpenStack cluster
284-
`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.
285-
`should check that the kubernetes-dashboard instance is alive`, // we don't create this
286-
// `\[Feature:ManualPerformance\]`, // requires /resetMetrics which we don't expose
291+
`Ingress`, // Not enabled yet
292+
`Cinder`, // requires an OpenStack cluster
287293

288294
// See the CanSupport implementation in upstream to determine wether these work.
289-
`Ceph RBD`, // Works if ceph-common Binary installed (but we can't guarantee this on all clusters).
290-
`GlusterFS`, // May work if /sbin/mount.glusterfs to be installed for plugin to work (also possibly blocked by serial pulling)
291-
`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.
295+
`Ceph RBD`, // Works if ceph-common Binary installed (but we can't guarantee this on all clusters).
296+
`GlusterFS`, // May work if /sbin/mount.glusterfs to be installed for plugin to work (also possibly blocked by serial pulling)
297+
// `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.
292298

293299
// Failing because of https://github.com/openshift/origin/issues/12365 against a real cluster
294300
//`should allow starting 95 pods per node`,
@@ -300,16 +306,13 @@ var (
300306
`ServiceAccounts should ensure a single API token exists`, // We create lots of secrets
301307
`should test kube-proxy`, // needs 2 nodes
302308
`authentication: OpenLDAP`, // needs separate setup and bucketing for openldap bootstrapping
303-
`NFS`, // no permissions https://github.com/openshift/origin/pull/6884
304-
`\[Feature:Example\]`, // has cleanup issues
309+
// `NFS`, // no permissions https://github.com/openshift/origin/pull/6884
305310
`NodeProblemDetector`, // requires a non-master node to run on
306311
//`unchanging, static URL paths for kubernetes api services`, // the test needs to exclude URLs that are not part of conformance (/logs)
307312

308313
// Needs triage to determine why it is failing
309-
`Addon update`, // TRIAGE
310-
`SSH`, // TRIAGE
311-
`\[Feature:Upgrade\]`, // TRIAGE
312-
`SELinux relabeling`, // https://github.com/openshift/origin/issues/7287
314+
`SSH`, // TRIAGE
315+
// `SELinux relabeling`, // https://github.com/openshift/origin/issues/7287
313316
`openshift mongodb replication creating from a template`, // flaking on deployment
314317
//`Update Demo should do a rolling update of a replication controller`, // this is flaky and needs triaging
315318

@@ -322,32 +325,26 @@ var (
322325
// Requires too many pods per node for the per core defaults
323326
//`should ensure that critical pod is scheduled in case there is no resources available`,
324327

325-
// Need multiple nodes
326-
`validates that InterPodAntiAffinity is respected if matching 2`,
327-
328328
// Inordinately slow tests
329329
`should create and stop a working application`,
330330
//`should always delete fast`, // will be uncommented in etcd3
331331

332-
// tested by networking.sh and requires the environment that script sets up
333-
`\[networking\] OVS`,
334-
335332
// We don't install KubeDNS
336333
`should check if Kubernetes master services is included in cluster-info`,
337334

338335
// this tests dns federation configuration via configmap, which we don't support yet
339336
`DNS configMap`,
340337

341-
// this tests the _kube_ downgrade. we don't support that.
342-
`\[Feature:Downgrade\]`,
343-
344338
// upstream flakes
345-
`validates resource limits of pods that are allowed to run`, // can't schedule to master due to node label limits, also fiddly
339+
// `validates resource limits of pods that are allowed to run`, // can't schedule to master due to node label limits, also fiddly
346340

347341
// TODO undisable:
348-
`should provide basic identity`, // needs a persistent volume provisioner in single node, host path not working
342+
// `should provide basic identity`, // needs a persistent volume provisioner in single node, host path not working
349343
`should idle the service and DeploymentConfig properly`, // idling with a single service and DeploymentConfig [Conformance]
350344

345+
// TODO: would be good to use
346+
`Metadata Concealment`,
347+
351348
// slow as sin and twice as ugly (11m each)
352349
"Pod should avoid to schedule to node that have avoidPod annotation",
353350
"Pod should be schedule to node that satisify the PodAffinity",

0 commit comments

Comments
 (0)