github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99467 from wojtek-t/cleanup_describe_5

Browse Source 
Remove KubeDescribe from SIGDescribe calls
This commit is contained in:
Kubernetes Prow Robot 2021-02-26 11:32:44 -08:00 committed by GitHub
commit e5e3c8d4f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 960 additions and 964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1885
test/conformance/testdata/conformance.yaml vendored
View File

File diff suppressed because it is too large Load Diff

4
test/e2e/cloud/framework.go
View File

@ -16,9 +16,9 @@ limitations under the License.
package cloud package cloud
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
// SIGDescribe annotates the test with the SIG label. // SIGDescribe annotates the test with the SIG label.
func SIGDescribe(text string, body func()) bool { func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-cloud-provider] "+text, body) return ginkgo.Describe("[sig-cloud-provider] "+text, body)
} }

3
test/e2e/cloud/gcp/cluster_upgrade.go
View File

@ -322,13 +322,14 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
}) })
}) })
// TODO(#98326): Figure out the right SIG and use appropriate SIGDescribe.
var _ = ginkgo.Describe("[sig-apps] stateful Upgrade [Feature:StatefulUpgrade]", func() { var _ = ginkgo.Describe("[sig-apps] stateful Upgrade [Feature:StatefulUpgrade]", func() {
f := framework.NewDefaultFramework("stateful-upgrade") f := framework.NewDefaultFramework("stateful-upgrade")
// Create the frameworks here because we can only create them // Create the frameworks here because we can only create them
// in a "Describe". // in a "Describe".
testFrameworks := createUpgradeFrameworks(statefulsetUpgradeTests) testFrameworks := createUpgradeFrameworks(statefulsetUpgradeTests)
framework.KubeDescribe("stateful upgrade", func() { ginkgo.Describe("stateful upgrade", func() {
ginkgo.It("should maintain a functioning cluster", func() { ginkgo.It("should maintain a functioning cluster", func() {
upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), *upgradeTarget) upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), *upgradeTarget)
framework.ExpectNoError(err) framework.ExpectNoError(err)

4
test/e2e/cloud/gcp/framework.go
View File

@ -16,9 +16,9 @@ limitations under the License.
package gcp package gcp
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
// SIGDescribe annotates the test with the SIG label. // SIGDescribe annotates the test with the SIG label.
func SIGDescribe(text string, body func()) bool { func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-cloud-provider-gcp] "+text, body) return ginkgo.Describe("[sig-cloud-provider-gcp] "+text, body)
} }

8
test/e2e/common/framework.go
View File

@ -16,19 +16,19 @@ limitations under the License.
package common package common
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
// SIGNetworkDescribe annotates the test with the SIG Network label. // SIGNetworkDescribe annotates the test with the SIG Network label.
func SIGNetworkDescribe(text string, body func()) bool { func SIGNetworkDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-network] "+text, body) return ginkgo.Describe("[sig-network] "+text, body)
} }
// SIGNodeDescribe annotates the test with the SIG Node label. // SIGNodeDescribe annotates the test with the SIG Node label.
func SIGNodeDescribe(text string, body func()) bool { func SIGNodeDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-node] "+text, body) return ginkgo.Describe("[sig-node] "+text, body)
} }
// SIGStorageDescribe annotates the test with the SIG Storage label. // SIGStorageDescribe annotates the test with the SIG Storage label.
func SIGStorageDescribe(text string, body func()) bool { func SIGStorageDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-storage] "+text, body) return ginkgo.Describe("[sig-storage] "+text, body)
} }

4
test/e2e/common/network/framework.go
View File

@ -16,9 +16,9 @@ limitations under the License.
package network package network
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
// SIGDescribe annotates the test with the SIG label. // SIGDescribe annotates the test with the SIG label.
func SIGDescribe(text string, body func()) bool { func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-network] "+text, body) return ginkgo.Describe("[sig-network] "+text, body)
} }

4
test/e2e/common/node/framework.go
View File

@ -16,9 +16,9 @@ limitations under the License.
package node package node
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
// SIGDescribe annotates the test with the SIG label. // SIGDescribe annotates the test with the SIG label.
func SIGDescribe(text string, body func()) bool { func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-node] "+text, body) return ginkgo.Describe("[sig-node] "+text, body)
} }

4
test/e2e/common/storage/framework.go
View File

@ -16,9 +16,9 @@ limitations under the License.
package storage package storage
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
// SIGDescribe annotates the test with the SIG label. // SIGDescribe annotates the test with the SIG label.
func SIGDescribe(text string, body func()) bool { func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-storage] "+text, body) return ginkgo.Describe("[sig-storage] "+text, body)
} }

4
test/e2e/node/framework.go
View File

@ -16,9 +16,9 @@ limitations under the License.
package node package node
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
// SIGDescribe annotates the test with the SIG label. // SIGDescribe annotates the test with the SIG label.
func SIGDescribe(text string, body func()) bool { func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-node] "+text, body) return ginkgo.Describe("[sig-node] "+text, body)
} }

4
test/e2e_kubeadm/framework.go
View File

@ -16,9 +16,9 @@ limitations under the License.
package kubeadm package kubeadm
import "k8s.io/kubernetes/test/e2e/framework" import "github.com/onsi/ginkgo"
// Describe annotates the test with the Kubeadm label. // Describe annotates the test with the Kubeadm label.
func Describe(text string, body func()) bool { func Describe(text string, body func()) bool {
return framework.KubeDescribe("[sig-cluster-lifecycle] [area-kubeadm] "+text, body) return ginkgo.Describe("[sig-cluster-lifecycle] [area-kubeadm] "+text, body)
} }