Skip to content

Commit

Permalink
test: re-enable upgrade tests
Browse files Browse the repository at this point in the history
Now final upgrade version is COSI API compatible.

Signed-off-by: Andrey Smirnov <[email protected]>
(cherry picked from commit 11edb2c)
  • Loading branch information
smira committed Aug 29, 2022
1 parent 867d2a4 commit 88c9479
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 5 additions & 8 deletions internal/integration/provision/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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},
Expand Down

0 comments on commit 88c9479

Please sign in to comment.