Skip to content

Commit 60a60b9

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

File tree

2 files changed

+46
-26
lines changed

2 files changed

+46
-26
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

+27-26
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,18 @@ var (
262262
`\[Feature:ImagePrune\]`,
263263
// Quota isn't turned on by default, we should do that and then reenable these tests
264264
`\[Feature:ImageQuota\]`,
265-
// Currently disabled by default
266-
`\[Feature:Initializers\]`,
267265
// Needs special configuration
268266
`\[Feature:Audit\]`,
267+
// has cleanup issues
268+
`\[Feature:Example\]`,
269+
270+
// May be too expensive
271+
// `\[Feature:ManualPerformance\]`,
272+
// Don't run kube-dns
273+
`kube-dns-autoscaler`,
274+
275+
// vSphere tests can be skipped generally
276+
`vsphere`,
269277

270278
// Depends on external components, may not need yet
271279
`Monitoring`, // Not installed, should be
@@ -275,18 +283,13 @@ var (
275283
`kube-ui`, // Not installed by default
276284
`^Kubernetes Dashboard`, // Not installed by default (also probably slow image pull)
277285

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
286+
`Ingress`, // Not enabled yet
287+
`Cinder`, // requires an OpenStack cluster
285288

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

291294
// Failing because of https://github.com/openshift/origin/issues/12365 against a real cluster
292295
//`should allow starting 95 pods per node`,
@@ -298,16 +301,13 @@ var (
298301
`ServiceAccounts should ensure a single API token exists`, // We create lots of secrets
299302
`should test kube-proxy`, // needs 2 nodes
300303
`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
304+
// `NFS`, // no permissions https://github.com/openshift/origin/pull/6884
303305
`NodeProblemDetector`, // requires a non-master node to run on
304306
//`unchanging, static URL paths for kubernetes api services`, // the test needs to exclude URLs that are not part of conformance (/logs)
305307

306308
// 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
309+
`SSH`, // TRIAGE
310+
// `SELinux relabeling`, // https://github.com/openshift/origin/issues/7287
311311
`openshift mongodb replication creating from a template`, // flaking on deployment
312312
//`Update Demo should do a rolling update of a replication controller`, // this is flaky and needs triaging
313313

@@ -320,9 +320,6 @@ var (
320320
// Requires too many pods per node for the per core defaults
321321
//`should ensure that critical pod is scheduled in case there is no resources available`,
322322

323-
// Need multiple nodes
324-
`validates that InterPodAntiAffinity is respected if matching 2`,
325-
326323
// Inordinately slow tests
327324
`should create and stop a working application`,
328325
//`should always delete fast`, // will be uncommented in etcd3
@@ -333,20 +330,23 @@ var (
333330
// this tests dns federation configuration via configmap, which we don't support yet
334331
`DNS configMap`,
335332

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

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

340+
// TODO: would be good to use
341+
`Metadata Concealment`,
342+
346343
// slow as sin and twice as ugly (11m each)
347344
"Pod should avoid to schedule to node that have avoidPod annotation",
348345
"Pod should be schedule to node that satisify the PodAffinity",
349346
"Pod should be prefer scheduled to node that satisify the NodeAffinity",
347+
348+
// Upstream-install specific
349+
`Firewall rule should have correct firewall rules for e2e cluster`,
350350
}
351351
excludedTestsFilter = regexp.MustCompile(strings.Join(excludedTests, `|`))
352352

@@ -361,6 +361,7 @@ var (
361361
serialTests = []string{
362362
`\[Serial\]`,
363363
`\[Disruptive\]`,
364+
`\[Feature:Performance\]`, // requires isolation
364365
`\[Feature:ManualPerformance\]`, // requires isolation
365366
`\[Feature:HighDensityPerformance\]`, // requires no other namespaces
366367
`Service endpoints latency`, // requires low latency

0 commit comments

Comments
 (0)