Skip to content

K
k3s
Commit 51ef709e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #50570 from xiangpengzhao/clc-prefix

Automatic merge from submit-queue (batch tested with PRs 51513, 51515, 50570, 51482, 51448) Removes redundant prefix in cluster-lifecycle e2e test names **What this PR does / why we need it**: Removes redundant prefix in cluster-lifecycle e2e test names **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # Umbrella issue #49161 xref: #50054 **Special notes for your reviewer**: /cc @jbeda **Release note**: ```release-note NONE ```
parents b7381c3b 3a12acee
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
test/e2e/lifecycle/cluster_upgrade.go
View file @ 51ef709e
......@@ -59,13 +59,13 @@ var statefulsetUpgradeTests = []upgrades.Test{
&upgrades.CassandraUpgradeTest{},
}
var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
f := framework.NewDefaultFramework("cluster-upgrade")
// Create the frameworks here because we can only create them
// in a "Describe".
testFrameworks := createUpgradeFrameworks(upgradeTests)
SIGDescribe("master upgrade", func() {
Describe("master upgrade", func() {
It("should maintain a functioning cluster [Feature:MasterUpgrade]", func() {
upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), framework.TestContext.UpgradeTarget)
framework.ExpectNoError(err)
......@@ -88,7 +88,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
})
})
SIGDescribe("node upgrade", func() {
Describe("node upgrade", func() {
It("should maintain a functioning cluster [Feature:NodeUpgrade]", func() {
upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), framework.TestContext.UpgradeTarget)
framework.ExpectNoError(err)
......@@ -110,7 +110,7 @@ var _ = framework.KubeDescribe("Upgrade [Feature:Upgrade]", func() {
})
})
SIGDescribe("cluster upgrade", func() {
Describe("cluster upgrade", func() {
It("should maintain a functioning cluster [Feature:ClusterUpgrade]", func() {
upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), framework.TestContext.UpgradeTarget)
framework.ExpectNoError(err)
......@@ -139,7 +139,7 @@ var _ = SIGDescribe("Downgrade [Feature:Downgrade]", func() {
// in a "Describe".
testFrameworks := createUpgradeFrameworks(upgradeTests)
SIGDescribe("cluster downgrade", func() {
Describe("cluster downgrade", func() {
It("should maintain a functioning cluster [Feature:ClusterDowngrade]", func() {
upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), framework.TestContext.UpgradeTarget)
framework.ExpectNoError(err)
......@@ -169,7 +169,7 @@ var _ = SIGDescribe("etcd Upgrade [Feature:EtcdUpgrade]", func() {
// Create the frameworks here because we can only create them
// in a "Describe".
testFrameworks := createUpgradeFrameworks(upgradeTests)
SIGDescribe("etcd upgrade", func() {
Describe("etcd upgrade", func() {
It("should maintain a functioning cluster", func() {
upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), "")
framework.ExpectNoError(err)
......
test/e2e/lifecycle/resize_nodes.go
View file @ 51ef709e
......@@ -64,7 +64,7 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() {
})
// Slow issue #13323 (8 min)
SIGDescribe("Resize [Slow]", func() {
Describe("Resize [Slow]", func() {
var skipped bool
BeforeEach(func() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment