test: upgrade tests to update from v1.11

With the upcoming v1.12 release, Rook upgrade tests
should upgrade from v1.11.x to master instead of
from v1.10.x to master.

Signed-off-by: Sheetal Pamecha <spamecha@redhat.com>
This commit is contained in:
Sheetal Pamecha committed 2023-06-13 03:48:45 +05:30
1 parent 97bf52d769
commit a6d57c164d
3 files changed
+9 -15

No files matched your search

+1 -1
View File
@@ -66,7 +66,7 @@ func NewCephManifests(settings *TestCephSettings) CephManifests {
switch settings.RookVersion {
case LocalBuildTag:
return &CephManifestsMaster{settings}
case Version1_10:
case Version1_11:
return &CephManifestsPreviousVersion{settings, &CephManifestsMaster{settings}}
}
panic(fmt.Errorf("unrecognized ceph manifest version: %s", settings.RookVersion))
@@ -24,7 +24,7 @@ import (
const (
// The version from which the upgrade test will start
Version1_10 = "v1.10.10"
Version1_11 = "v1.11.7"
)
// CephManifestsPreviousVersion wraps rook yaml definitions
@@ -86,13 +86,7 @@ func (m *CephManifestsPreviousVersion) GetCommonExternal() string {
// GetRookCluster returns rook-cluster manifest
func (m *CephManifestsPreviousVersion) GetCephCluster() string {
c := m.latest.GetCephCluster()
// Remove the requireMsgr2 setting if in v1.10
if m.settings.RookVersion == Version1_10 {
return strings.Replace(c, "requireMsgr2: false", "", 1)
}
return c
return m.latest.GetCephCluster()
}
func (m *CephManifestsPreviousVersion) GetBlockSnapshotClass(snapshotClassName, reclaimPolicy string) string {