Skip to content

Commit 329bf43

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #11686 from cahillsf/add-labels-to-e2e
🌱 Add ginkgo labels to e2e tests
2 parents 02e03de + 2b23e81 commit 329bf43

10 files changed

+22
-22
lines changed

‎test/e2e/autoscaler_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/utils/ptr"
2525
)
2626

27-
var _ = Describe("When using the autoscaler with Cluster API using ClusterClass [ClusterClass]", func() {
27+
var _ = Describe("When using the autoscaler with Cluster API using ClusterClass [ClusterClass]", Label("ClusterClass"), func() {
2828
AutoscalerSpec(ctx, func() AutoscalerSpecInput {
2929
return AutoscalerSpecInput{
3030
E2EConfig: e2eConfig,

‎test/e2e/cluster_deletion_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/utils/ptr"
2828
)
2929

30-
var _ = Describe("When performing cluster deletion with ClusterClass [ClusterClass]", func() {
30+
var _ = Describe("When performing cluster deletion with ClusterClass [ClusterClass]", Label("ClusterClass"), func() {
3131
ClusterDeletionSpec(ctx, func() ClusterDeletionSpecInput {
3232
return ClusterDeletionSpecInput{
3333
E2EConfig: e2eConfig,

‎test/e2e/cluster_upgrade_runtimesdk_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/cluster-api/test/framework"
3030
)
3131

32-
var _ = Describe("When upgrading a workload cluster using ClusterClass with RuntimeSDK [ClusterClass]", func() {
32+
var _ = Describe("When upgrading a workload cluster using ClusterClass with RuntimeSDK [ClusterClass]", Label("ClusterClass"), func() {
3333
ClusterUpgradeWithRuntimeSDKSpec(ctx, func() ClusterUpgradeWithRuntimeSDKSpecInput {
3434
version, err := semver.ParseTolerant(e2eConfig.GetVariable(KubernetesVersionUpgradeFrom))
3535
Expect(err).ToNot(HaveOccurred(), "Invalid argument, KUBERNETES_VERSION_UPGRADE_FROM is not a valid version")

‎test/e2e/cluster_upgrade_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"sigs.k8s.io/cluster-api/util/patch"
3838
)
3939

40-
var _ = Describe("When upgrading a workload cluster using ClusterClass and testing K8S conformance [Conformance] [K8s-Upgrade] [ClusterClass]", func() {
40+
var _ = Describe("When upgrading a workload cluster using ClusterClass and testing K8S conformance [Conformance] [K8s-Upgrade] [ClusterClass]", Label("Conformance", "K8s-Upgrade", "ClusterClass"), func() {
4141
ClusterUpgradeConformanceSpec(ctx, func() ClusterUpgradeConformanceSpecInput {
4242
return ClusterUpgradeConformanceSpecInput{
4343
E2EConfig: e2eConfig,
@@ -51,7 +51,7 @@ var _ = Describe("When upgrading a workload cluster using ClusterClass and testi
5151
})
5252
})
5353

54-
var _ = Describe("When upgrading a workload cluster using ClusterClass [ClusterClass]", func() {
54+
var _ = Describe("When upgrading a workload cluster using ClusterClass [ClusterClass]", Label("ClusterClass"), func() {
5555
ClusterUpgradeConformanceSpec(ctx, func() ClusterUpgradeConformanceSpecInput {
5656
return ClusterUpgradeConformanceSpecInput{
5757
E2EConfig: e2eConfig,
@@ -70,7 +70,7 @@ var _ = Describe("When upgrading a workload cluster using ClusterClass [ClusterC
7070
})
7171
})
7272

73-
var _ = Describe("When upgrading a workload cluster using ClusterClass with a HA control plane [ClusterClass]", func() {
73+
var _ = Describe("When upgrading a workload cluster using ClusterClass with a HA control plane [ClusterClass]", Label("ClusterClass"), func() {
7474
controlPlaneMachineCount := int64(3)
7575
ClusterUpgradeConformanceSpec(ctx, func() ClusterUpgradeConformanceSpecInput {
7676
return ClusterUpgradeConformanceSpecInput{
@@ -203,7 +203,7 @@ var _ = Describe("When upgrading a workload cluster using ClusterClass with a HA
203203
})
204204
})
205205

206-
var _ = Describe("When upgrading a workload cluster using ClusterClass with a HA control plane using scale-in rollout [ClusterClass]", func() {
206+
var _ = Describe("When upgrading a workload cluster using ClusterClass with a HA control plane using scale-in rollout [ClusterClass]", Label("ClusterClass"), func() {
207207
ClusterUpgradeConformanceSpec(ctx, func() ClusterUpgradeConformanceSpecInput {
208208
return ClusterUpgradeConformanceSpecInput{
209209
E2EConfig: e2eConfig,

‎test/e2e/clusterclass_changes_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/utils/ptr"
2525
)
2626

27-
var _ = Describe("When testing ClusterClass changes [ClusterClass]", func() {
27+
var _ = Describe("When testing ClusterClass changes [ClusterClass]", Label("ClusterClass"), func() {
2828
ClusterClassChangesSpec(ctx, func() ClusterClassChangesSpecInput {
2929
return ClusterClassChangesSpecInput{
3030
E2EConfig: e2eConfig,

‎test/e2e/clusterclass_rollout_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/utils/ptr"
2525
)
2626

27-
var _ = Describe("When testing ClusterClass rollouts [ClusterClass]", func() {
27+
var _ = Describe("When testing ClusterClass rollouts [ClusterClass]", Label("ClusterClass"), func() {
2828
ClusterClassRolloutSpec(ctx, func() ClusterClassRolloutSpecInput {
2929
return ClusterClassRolloutSpecInput{
3030
E2EConfig: e2eConfig,

‎test/e2e/clusterctl_upgrade_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ var _ = Describe("When testing clusterctl upgrades (v1.0=>current)", func() {
219219
})
220220

221221
// Note: This test should be changed during "prepare main branch", it should test n-2 => current.
222-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.8=>current) [ClusterClass]", func() {
222+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.8=>current) [ClusterClass]", Label("ClusterClass"), func() {
223223
// Get n-2 latest stable release
224224
version := "1.8"
225225
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
@@ -252,7 +252,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.8=>cur
252252
})
253253

254254
// Note: This test should be changed during "prepare main branch", it should test n-1 => current.
255-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>current) [ClusterClass]", func() {
255+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>current) [ClusterClass]", Label("ClusterClass"), func() {
256256
// Get n-1 latest stable release
257257
version := "1.9"
258258
stableRelease, err := GetStableReleaseOfMinor(ctx, version)
@@ -279,7 +279,7 @@ var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>cur
279279
})
280280

281281
// Note: This test should be changed during "prepare main branch", it should test n-1 => current.
282-
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>current) on K8S latest ci mgmt cluster [ClusterClass]", func() {
282+
var _ = Describe("When testing clusterctl upgrades using ClusterClass (v1.9=>current) on K8S latest ci mgmt cluster [ClusterClass]", Label("ClusterClass"), func() {
283283
// Get n-1 latest stable release
284284
version := "1.9"
285285
stableRelease, err := GetStableReleaseOfMinor(ctx, version)

‎test/e2e/k8s_conformance_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/cluster-api/test/framework/kubernetesversions"
3030
)
3131

32-
var _ = Describe("When testing K8S conformance [Conformance] [K8s-Install]", func() {
32+
var _ = Describe("When testing K8S conformance [Conformance] [K8s-Install]", Label("Conformance", "K8s-Install"), func() {
3333
// Note: This installs a cluster based on KUBERNETES_VERSION and runs conformance tests.
3434
K8SConformanceSpec(ctx, func() K8SConformanceSpecInput {
3535
return K8SConformanceSpecInput{
@@ -42,7 +42,7 @@ var _ = Describe("When testing K8S conformance [Conformance] [K8s-Install]", fun
4242
})
4343
})
4444

45-
var _ = Describe("When testing K8S conformance with K8S latest ci [Conformance] [K8s-Install-ci-latest]", func() {
45+
var _ = Describe("When testing K8S conformance with K8S latest ci [Conformance] [K8s-Install-ci-latest]", Label("Conformance", "K8s-Install-ci-latest"), func() {
4646
// Note: This installs a cluster based on KUBERNETES_VERSION_LATEST_CI and runs conformance tests.
4747
// Note: We are resolving KUBERNETES_VERSION_LATEST_CI and then setting the resolved version as
4848
// KUBERNETES_VERSION env var. This only works without side effects on other tests because we are

‎test/e2e/quick_start_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ var _ = Describe("When following the Cluster API quick-start", func() {
7676
})
7777
})
7878

79-
var _ = Describe("When following the Cluster API quick-start with ClusterClass [PR-Blocking] [ClusterClass]", func() {
79+
var _ = Describe("When following the Cluster API quick-start with ClusterClass [PR-Blocking] [ClusterClass]", Label("PR-Blocking", "ClusterClass"), func() {
8080
QuickStartSpec(ctx, func() QuickStartSpecInput {
8181
return QuickStartSpecInput{
8282
E2EConfig: e2eConfig,
@@ -125,7 +125,7 @@ var _ = Describe("When following the Cluster API quick-start with ClusterClass [
125125
})
126126

127127
// NOTE: This test requires an IPv6 management cluster (can be configured via IP_FAMILY=IPv6).
128-
var _ = Describe("When following the Cluster API quick-start with IPv6 [IPv6]", func() {
128+
var _ = Describe("When following the Cluster API quick-start with IPv6 [IPv6]", Label("IPv6"), func() {
129129
QuickStartSpec(ctx, func() QuickStartSpecInput {
130130
return QuickStartSpecInput{
131131
E2EConfig: e2eConfig,
@@ -153,7 +153,7 @@ var _ = Describe("When following the Cluster API quick-start with Ignition", fun
153153
})
154154
})
155155

156-
var _ = Describe("When following the Cluster API quick-start with dualstack and ipv4 primary [IPv6]", func() {
156+
var _ = Describe("When following the Cluster API quick-start with dualstack and ipv4 primary [IPv6]", Label("IPv6"), func() {
157157
QuickStartSpec(ctx, func() QuickStartSpecInput {
158158
return QuickStartSpecInput{
159159
E2EConfig: e2eConfig,
@@ -180,7 +180,7 @@ var _ = Describe("When following the Cluster API quick-start with dualstack and
180180
})
181181
})
182182

183-
var _ = Describe("When following the Cluster API quick-start with dualstack and ipv6 primary [IPv6]", func() {
183+
var _ = Describe("When following the Cluster API quick-start with dualstack and ipv6 primary [IPv6]", Label("IPv6"), func() {
184184
QuickStartSpec(ctx, func() QuickStartSpecInput {
185185
return QuickStartSpecInput{
186186
E2EConfig: e2eConfig,
@@ -207,7 +207,7 @@ var _ = Describe("When following the Cluster API quick-start with dualstack and
207207
})
208208
})
209209

210-
var _ = Describe("When following the Cluster API quick-start with ClusterClass without any worker definitions [ClusterClass]", func() {
210+
var _ = Describe("When following the Cluster API quick-start with ClusterClass without any worker definitions [ClusterClass]", Label("ClusterClass"), func() {
211211
QuickStartSpec(ctx, func() QuickStartSpecInput {
212212
return QuickStartSpecInput{
213213
E2EConfig: e2eConfig,

‎test/e2e/self_hosted_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/utils/ptr"
2525
)
2626

27-
var _ = Describe("When testing Cluster API working on self-hosted clusters using ClusterClass [ClusterClass]", func() {
27+
var _ = Describe("When testing Cluster API working on self-hosted clusters using ClusterClass [ClusterClass]", Label("ClusterClass"), func() {
2828
SelfHostedSpec(ctx, func() SelfHostedSpecInput {
2929
return SelfHostedSpecInput{
3030
E2EConfig: e2eConfig,
@@ -40,7 +40,7 @@ var _ = Describe("When testing Cluster API working on self-hosted clusters using
4040
})
4141
})
4242

43-
var _ = Describe("When testing Cluster API working on self-hosted clusters using ClusterClass with a HA control plane [ClusterClass]", func() {
43+
var _ = Describe("When testing Cluster API working on self-hosted clusters using ClusterClass with a HA control plane [ClusterClass]", Label("ClusterClass"), func() {
4444
SelfHostedSpec(ctx, func() SelfHostedSpecInput {
4545
return SelfHostedSpecInput{
4646
E2EConfig: e2eConfig,
@@ -56,7 +56,7 @@ var _ = Describe("When testing Cluster API working on self-hosted clusters using
5656
})
5757
})
5858

59-
var _ = Describe("When testing Cluster API working on single-node self-hosted clusters using ClusterClass [ClusterClass]", func() {
59+
var _ = Describe("When testing Cluster API working on single-node self-hosted clusters using ClusterClass [ClusterClass]", Label("ClusterClass"), func() {
6060
SelfHostedSpec(ctx, func() SelfHostedSpecInput {
6161
return SelfHostedSpecInput{
6262
E2EConfig: e2eConfig,

0 commit comments

Comments
 (0)