github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37412 from janetkuo/revert-revert-remove-slow-statefulset

Browse Source 
Automatic merge from submit-queue

Revert "Revert "Remove [Slow] from statefulset basic tests""

Reverts #37387, see https://github.com/kubernetes/kubernetes/pull/37387#issuecomment-262629767

Don't merge yet until #37393 is fixed
This commit is contained in:
Kubernetes Submit Queue 2016-11-30 21:11:09 -08:00 committed by GitHub
commit b2cabee2f2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/petset.go
View File

@ -70,10 +70,9 @@ var (
StatefulSetGroupVersionResource = schema.GroupVersionResource{Group: apps.GroupName, Version: "v1beta1", Resource: "statefulsets"} StatefulSetGroupVersionResource = schema.GroupVersionResource{Group: apps.GroupName, Version: "v1beta1", Resource: "statefulsets"}
) )
// Time: 25m, slow by design.
// GCE Quota requirements: 3 pds, one per pet manifest declared above. // GCE Quota requirements: 3 pds, one per pet manifest declared above.
// GCE Api requirements: nodes and master need storage r/w permissions. // GCE Api requirements: nodes and master need storage r/w permissions.
var _ = framework.KubeDescribe("StatefulSet [Slow]", func() { var _ = framework.KubeDescribe("StatefulSet", func() {
f := framework.NewDefaultFramework("statefulset") f := framework.NewDefaultFramework("statefulset")
var ns string var ns string
var c clientset.Interface var c clientset.Interface
@ -355,7 +354,7 @@ var _ = framework.KubeDescribe("StatefulSet [Slow]", func() {
}) })
}) })
framework.KubeDescribe("Deploy clustered applications [Feature:StatefulSet]", func() { framework.KubeDescribe("Deploy clustered applications [Feature:StatefulSet] [Slow]", func() {
var pst *statefulSetTester var pst *statefulSetTester
var appTester *clusterAppTester var appTester *clusterAppTester
@ -394,7 +393,7 @@ var _ = framework.KubeDescribe("StatefulSet [Slow]", func() {
}) })
}) })
var _ = framework.KubeDescribe("Stateful Set recreate [Slow]", func() { var _ = framework.KubeDescribe("Stateful Set recreate", func() {
f := framework.NewDefaultFramework("pet-set-recreate") f := framework.NewDefaultFramework("pet-set-recreate")
var c clientset.Interface var c clientset.Interface
var ns string var ns string