tests: upgrade from 1.17 to master
For the integration tests, now we start upgrading from v1.17.x
to the master branch, to test that the upgrades are stable
to what will become the 1.18 release.
Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit 86d30082ab)
This commit is contained in:
1 parent
9a34af63b6
commit
7fac68eddf
4 files changed
+4
-4
No files matched your search
@@ -474,7 +474,7 @@ func (h *CephInstaller) GetNodeHostnames() ([]string, error) {
|
||||
}
|
||||
|
||||
func (h *CephInstaller) InstallCSIOperator() error {
|
||||
if h.settings.RookVersion == Version1_16 {
|
||||
if h.settings.RookVersion == Version1_17 {
|
||||
logger.Infof("Skipping the CSI operator installation for previous version of Rook")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ func NewCephManifests(settings *TestCephSettings) CephManifests {
|
||||
switch settings.RookVersion {
|
||||
case LocalBuildTag:
|
||||
return &CephManifestsMaster{settings}
|
||||
case Version1_16:
|
||||
case Version1_17:
|
||||
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_16 = "v1.16.6"
|
||||
Version1_17 = "v1.17.7"
|
||||
)
|
||||
|
||||
// CephManifestsPreviousVersion wraps rook yaml definitions
|
||||
|
||||
@@ -105,7 +105,7 @@ func (s *UpgradeSuite) TestUpgradeHelm() {
|
||||
}
|
||||
|
||||
func (s *UpgradeSuite) testUpgrade(useHelm bool, initialCephVersion v1.CephVersionSpec) {
|
||||
baseRookImage := installer.Version1_16
|
||||
baseRookImage := installer.Version1_17
|
||||
s.baseSetup(useHelm, baseRookImage, initialCephVersion)
|
||||
|
||||
objectUserID := "upgraded-user"
|
||||
|
||||
Reference in new issue
Block a user