From 2e8468a47c183f2794326bcb8d27ef4d6e153c6b Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 7 Mar 2024 16:31:09 -0700 Subject: [PATCH] core: upgrade test from 1.13 to master The upgrade test should always upgrade from the previous minor release to the latest master. With 1.14 releasing soon, now we upgrade from 1.13 to master, to confirm if there are any upgrade issues to 1.14. Signed-off-by: Travis Nielsen --- tests/framework/installer/ceph_manifests.go | 2 +- tests/framework/installer/ceph_manifests_previous.go | 2 +- tests/integration/ceph_upgrade_test.go | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 96becfc95..471d79e76 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -71,7 +71,7 @@ func NewCephManifests(settings *TestCephSettings) CephManifests { switch settings.RookVersion { case LocalBuildTag: return &CephManifestsMaster{settings} - case Version1_12: + case Version1_13: return &CephManifestsPreviousVersion{settings, &CephManifestsMaster{settings}} } panic(fmt.Errorf("unrecognized ceph manifest version: %s", settings.RookVersion)) diff --git a/tests/framework/installer/ceph_manifests_previous.go b/tests/framework/installer/ceph_manifests_previous.go index ff41757d7..3656659ce 100644 --- a/tests/framework/installer/ceph_manifests_previous.go +++ b/tests/framework/installer/ceph_manifests_previous.go @@ -24,7 +24,7 @@ import ( const ( // The version from which the upgrade test will start - Version1_12 = "v1.12.7" + Version1_13 = "v1.13.6" ) // CephManifestsPreviousVersion wraps rook yaml definitions diff --git a/tests/integration/ceph_upgrade_test.go b/tests/integration/ceph_upgrade_test.go index 0383b65b3..98db0ee65 100644 --- a/tests/integration/ceph_upgrade_test.go +++ b/tests/integration/ceph_upgrade_test.go @@ -88,7 +88,7 @@ func (s *UpgradeSuite) baseSetup(useHelm bool, initialCephVersion v1.CephVersion Mons: 1, EnableDiscovery: true, SkipClusterCleanup: true, - RookVersion: installer.Version1_12, + RookVersion: installer.Version1_13, CephVersion: initialCephVersion, } @@ -127,9 +127,9 @@ func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersi _ = s.helper.BucketClient.DeleteBucketStorageClass(s.namespace, installer.ObjectStoreName, installer.ObjectStoreSCName, "Delete") // - // Upgrade Rook from v1.12 to master + // Upgrade Rook from v1.13 to master // - logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_12) + logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_13) s.gatherLogs(s.settings.OperatorNamespace, "_before_master_upgrade") s.upgradeToMaster() @@ -138,7 +138,7 @@ func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersi err := s.installer.WaitForToolbox(s.namespace) assert.NoError(s.T(), err) - logger.Infof("Done with automatic upgrade from %s to master", installer.Version1_12) + logger.Infof("Done with automatic upgrade from %s to master", installer.Version1_13) newFile := "post-upgrade-previous-to-master-file" s.verifyFilesAfterUpgrade(newFile, rbdFilesToRead, cephfsFilesToRead) rbdFilesToRead = append(rbdFilesToRead, newFile) @@ -150,7 +150,7 @@ func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersi // do not need retry b/c the OBC controller runs parallel to Rook-Ceph orchestration assert.True(s.T(), s.helper.BucketClient.CheckOBC(obcName, "bound")) - logger.Infof("Verified upgrade from %s to master", installer.Version1_12) + logger.Infof("Verified upgrade from %s to master", installer.Version1_13) // SKIP the Ceph version upgrades for the helm test if s.settings.UseHelm { @@ -286,7 +286,7 @@ func (s *UpgradeSuite) deployClusterforUpgrade(objectUserID, preFilename string) require.True(s.T(), created) // verify that we're actually running the right pre-upgrade image - s.verifyOperatorImage(installer.Version1_12) + s.verifyOperatorImage(installer.Version1_13) assert.NoError(s.T(), s.k8sh.WriteToPod("", rbdPodName, preFilename, simpleTestMessage)) assert.NoError(s.T(), s.k8sh.ReadFromPod("", rbdPodName, preFilename, simpleTestMessage))