From 88c9479b2012b7d993ee74f08d46749408dd258d Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 24 Aug 2022 17:11:08 +0400 Subject: [PATCH] test: re-enable upgrade tests Now final upgrade version is COSI API compatible. Signed-off-by: Andrey Smirnov (cherry picked from commit 11edb2c6f84fbbfba437361ce4dcd70c50eb08d8) --- Makefile | 2 +- internal/integration/provision/upgrade.go | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 2fde3139d9..8a5fcb6e99 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ HELM_URL ?= https://get.helm.sh/helm-v3.9.2-linux-amd64.tar.gz CLUSTERCTL_VERSION ?= 1.1.3 CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64 TESTPKGS ?= github.com/talos-systems/talos/... -RELEASES ?= v1.0.6 v1.1.0 +RELEASES ?= v1.1.2 v1.2.0-beta.1 SHORT_INTEGRATION_TEST ?= CUSTOM_CNI_URL ?= INSTALLER_ARCH ?= all diff --git a/internal/integration/provision/upgrade.go b/internal/integration/provision/upgrade.go index f42886e669..14c06b5cb7 100644 --- a/internal/integration/provision/upgrade.go +++ b/internal/integration/provision/upgrade.go @@ -73,20 +73,18 @@ type upgradeSpec struct { } const ( - previousRelease = "v1.0.6" - stableRelease = "v1.1.0" // or soon-to-be-stable + previousRelease = "v1.1.2" + stableRelease = "v1.2.0-beta.1" // or soon-to-be-stable // The current version (the one being built on CI) is DefaultSettings.CurrentVersion. - previousK8sVersion = "1.23.6" // constants.DefaultKubernetesVersion in the previousRelease - stableK8sVersion = "1.24.2" // constants.DefaultKubernetesVersion in the stableRelease + previousK8sVersion = "1.24.3" // constants.DefaultKubernetesVersion in the previousRelease + stableK8sVersion = "1.25.0-rc.1" // constants.DefaultKubernetesVersion in the stableRelease currentK8sVersion = constants.DefaultKubernetesVersion ) var defaultNameservers = []net.IP{net.ParseIP("8.8.8.8"), net.ParseIP("1.1.1.1")} // upgradePreviousToStable upgrades from the previous Talos release to the stable release. -// -//nolint:deadcode,unused func upgradePreviousToStable() upgradeSpec { return upgradeSpec{ ShortName: fmt.Sprintf("%s-%s", previousRelease, stableRelease), @@ -744,8 +742,7 @@ func (suite *UpgradeSuite) SuiteName() string { func init() { allSuites = append( allSuites, - // TODO: temporarily disable the test until 'Stable' becomes v1.2.0-beta.0 - // &UpgradeSuite{specGen: upgradePreviousToStable, track: 0}, + &UpgradeSuite{specGen: upgradePreviousToStable, track: 0}, &UpgradeSuite{specGen: upgradeStableToCurrent, track: 1}, &UpgradeSuite{specGen: upgradeCurrentToCurrent, track: 2}, &UpgradeSuite{specGen: upgradeStableToCurrentPreserve, track: 0},