From 7fac68eddf0a1d24c048210a995812ce2c228aab Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 6 Aug 2025 15:02:50 -0600 Subject: [PATCH] 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 (cherry picked from commit 86d30082ab540ee1e0bae9aa6b4479ec656710c0) --- tests/framework/installer/ceph_installer.go | 2 +- tests/framework/installer/ceph_manifests.go | 2 +- tests/framework/installer/ceph_manifests_previous.go | 2 +- tests/integration/ceph_upgrade_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index f1b9f38a4..981a5a9ae 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -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 } diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index bb2e71cfb..63706052e 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_16: + case Version1_17: 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 e354811e9..a2c247326 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_16 = "v1.16.6" + Version1_17 = "v1.17.7" ) // CephManifestsPreviousVersion wraps rook yaml definitions diff --git a/tests/integration/ceph_upgrade_test.go b/tests/integration/ceph_upgrade_test.go index 9927fad0f..ef8401624 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_16 + baseRookImage := installer.Version1_17 s.baseSetup(useHelm, baseRookImage, initialCephVersion) objectUserID := "upgraded-user"