Skip to content

Commit

Permalink
Merge pull request #36018 from janetkuo/statefulset-beta-test
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Remove statefulset e2e test setup for alpha

Depends on #35731, once statefulset is beta, it doesn't need special treatment for alpha version in e2e test 

cc @erictune @foxish @kubernetes/sig-apps
  • Loading branch information
Kubernetes Submit Queue committed Nov 4, 2016
2 parents 4b3d6b4 + 008278d commit 4261598
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions test/e2e/petset.go
Expand Up @@ -66,22 +66,11 @@ const (
// GCE Quota requirements: 3 pds, one per pet manifest declared above.
// GCE Api requirements: nodes and master need storage r/w permissions.
var _ = framework.KubeDescribe("StatefulSet [Slow] [Feature:PetSet]", func() {
options := framework.FrameworkOptions{
GroupVersion: &unversioned.GroupVersion{Group: apps.GroupName, Version: "v1beta1"},
}
f := framework.NewFramework("petset", options, nil)
f := framework.NewDefaultFramework("statefulset")
var ns string
var c clientset.Interface

BeforeEach(func() {
// StatefulSet is in alpha, so it's disabled on some platforms. We skip this
// test if a resource get fails on non-GCE platforms.
// In theory, tests that restart pets should pass on any platform with a
// dynamic volume provisioner.
if !framework.ProviderIs("gce") {
framework.SkipIfMissingResource(f.ClientPool, unversioned.GroupVersionResource{Group: apps.GroupName, Version: "v1beta1", Resource: "statefulsets"}, f.Namespace.Name)
}

c = f.ClientSet
ns = f.Namespace.Name
})
Expand Down

0 comments on commit 4261598

Please sign in to comment.