From 14779155d26d452d62800d0b4d10c2f52bc75b07 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Thu, 2 Mar 2023 16:34:33 +0000 Subject: [PATCH] Add v1alpha6 clusterctl upgrade test --- test/e2e/data/e2e_conf.yaml | 14 +++++++++++++ test/e2e/shared/defaults.go | 1 + .../e2e/suites/e2e/clusterctl_upgrade_test.go | 21 +++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index 44d54f4a3d..be6f03f812 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -89,6 +89,20 @@ providers: new: "--v=4" - old: "--leader-elect" new: "--leader-elect=false\n - --sync-period=1m" + - name: v0.7.1 + value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/v0.7.1/infrastructure-components.yaml" + type: url + contract: v1beta1 + files: + - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml" + - sourcePath: "./infrastructure-openstack/cluster-template.yaml" + replacements: + - old: "imagePullPolicy: Always" + new: "imagePullPolicy: IfNotPresent" + - old: "--v=2" + new: "--v=4" + - old: "--leader-elect" + new: "--leader-elect=false\n - --sync-period=1m" - name: v0.7.99 value: ../../../config/default # This is the upcoming version. diff --git a/test/e2e/shared/defaults.go b/test/e2e/shared/defaults.go index 7cab59f4b2..55080263b2 100644 --- a/test/e2e/shared/defaults.go +++ b/test/e2e/shared/defaults.go @@ -49,6 +49,7 @@ const ( FlavorMultiNetwork = "multi-network-ci-artifacts" FlavorMultiAZ = "multi-az-ci-artifacts" FlavorV1alpha5 = "v1alpha5-ci-artifacts" + FlavorV1alpha6 = "v1alpha6-ci-artifacts" FlavorMDRemediation = "md-remediation-ci-artifacts" FlavorKCPRemediation = "kcp-remediation-ci-artifacts" ) diff --git a/test/e2e/suites/e2e/clusterctl_upgrade_test.go b/test/e2e/suites/e2e/clusterctl_upgrade_test.go index 3700420404..6cd0829b1c 100644 --- a/test/e2e/suites/e2e/clusterctl_upgrade_test.go +++ b/test/e2e/suites/e2e/clusterctl_upgrade_test.go @@ -53,3 +53,24 @@ var _ = Describe("When testing clusterctl upgrades (v0.6=>current) [clusterctl-u } }) }) + +var _ = Describe("When testing clusterctl upgrades (v0.7=>current) [clusterctl-upgrade]", func() { + ctx := context.TODO() + shared.SetEnvVar("USE_CI_ARTIFACTS", "true", false) + shared.SetEnvVar("DOWNLOAD_E2E_IMAGE", "true", false) + + capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput { + return capi_e2e.ClusterctlUpgradeSpecInput{ + E2EConfig: e2eCtx.E2EConfig, + ClusterctlConfigPath: e2eCtx.Environment.ClusterctlConfigPath, + BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy, + ArtifactFolder: e2eCtx.Settings.ArtifactFolder, + SkipCleanup: false, + InitWithBinary: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.1/clusterctl-{OS}-{ARCH}", + InitWithProvidersContract: "v1beta1", + InitWithInfrastructureProviders: []string{"openstack:v0.7.1"}, + MgmtFlavor: shared.FlavorDefault, + WorkloadFlavor: shared.FlavorV1alpha6, + } + }) +})