diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 18eb04dbd..d5406e740 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -271,10 +271,6 @@ func (h *CephInstaller) CreateCephCluster() error { func (h *CephInstaller) waitForCluster() error { monWaitLabel := "app=rook-ceph-mon,mon_daemon=true" - if h.Manifests.Settings().RookVersion == Version1_15 { - // TODO: Remove this when upgrade test is from v1.15.7 since prior releases do not have the mon_daemon label - monWaitLabel = "app=rook-ceph-mon" - } if err := h.k8shelper.WaitForPodCount(monWaitLabel, h.settings.Namespace, h.settings.Mons); err != nil { return err } @@ -472,7 +468,7 @@ func (h *CephInstaller) GetNodeHostnames() ([]string, error) { } func (h *CephInstaller) InstallCSIOperator() error { - if h.settings.RookVersion == Version1_15 { + if h.settings.RookVersion == Version1_16 { logger.Infof("Skipping the CSI operator installation for previous version of Rook") return nil } diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index afc4b3c27..ccecc7060 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -72,7 +72,7 @@ func NewCephManifests(settings *TestCephSettings) CephManifests { switch settings.RookVersion { case LocalBuildTag: return &CephManifestsMaster{settings} - case Version1_15: + case Version1_16: 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 c0904a328..e354811e9 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_15 = "v1.15.6" + Version1_16 = "v1.16.6" ) // CephManifestsPreviousVersion wraps rook yaml definitions diff --git a/tests/integration/ceph_upgrade_test.go b/tests/integration/ceph_upgrade_test.go index 4d0067101..0aae3798a 100644 --- a/tests/integration/ceph_upgrade_test.go +++ b/tests/integration/ceph_upgrade_test.go @@ -105,7 +105,7 @@ func (s *UpgradeSuite) TestUpgradeHelm() { } func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersionSpec) { - baseRookImage := installer.Version1_15 + baseRookImage := installer.Version1_16 s.baseSetup(useHelm, baseRookImage, initialCephVersion) objectUserID := "upgraded-user"