tests: upgrade from rook 1.16 to master

The upgrade tests in master have been upgrading from 1.15 to
master. In anticipation of the v1.17 release, we change
the upgrade tests to start from v1.16 to test if there
are any regressions in the supported upgrades.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit d3cb7271a7)

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
 	}

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))

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

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"