Skip to content

Commit 3035239

Browse files
committed
Remove It block from clusterctl upgrade
The ClusterctlUpgradeSpec contains a BeforeEach block so it cannot be nested in an It block.
1 parent ec27461 commit 3035239

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

test/e2e/suites/e2e/clusterctl_upgrade_test.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,21 @@ import (
3434
// When new minor releases are added (with the same contract) we will need to work on this
3535
// if we want to continue testing v0.6.
3636
var _ = Describe("When testing clusterctl upgrades (v0.6=>current) [clusterctl-upgrade]", func() {
37-
It("should succeed", func() {
38-
ctx := context.TODO()
39-
shared.SetEnvVar("USE_CI_ARTIFACTS", "true", false)
40-
shared.SetEnvVar("DOWNLOAD_E2E_IMAGE", "true", false)
41-
42-
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
43-
return capi_e2e.ClusterctlUpgradeSpecInput{
44-
E2EConfig: e2eCtx.E2EConfig,
45-
ClusterctlConfigPath: e2eCtx.Environment.ClusterctlConfigPath,
46-
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
47-
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
48-
SkipCleanup: false,
49-
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
50-
InitWithProvidersContract: "v1beta1",
51-
MgmtFlavor: shared.FlavorDefault,
52-
WorkloadFlavor: shared.FlavorV1alpha5,
53-
}
54-
})
37+
ctx := context.TODO()
38+
shared.SetEnvVar("USE_CI_ARTIFACTS", "true", false)
39+
shared.SetEnvVar("DOWNLOAD_E2E_IMAGE", "true", false)
40+
41+
capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
42+
return capi_e2e.ClusterctlUpgradeSpecInput{
43+
E2EConfig: e2eCtx.E2EConfig,
44+
ClusterctlConfigPath: e2eCtx.Environment.ClusterctlConfigPath,
45+
BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
46+
ArtifactFolder: e2eCtx.Settings.ArtifactFolder,
47+
SkipCleanup: false,
48+
InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.0/clusterctl-{OS}-{ARCH}",
49+
InitWithProvidersContract: "v1beta1",
50+
MgmtFlavor: shared.FlavorDefault,
51+
WorkloadFlavor: shared.FlavorV1alpha5,
52+
}
5553
})
5654
})

0 commit comments

Comments
 (0)