Skip to content

Commit

Permalink
test: upgrade test to update the toolbox spec
Browse files Browse the repository at this point in the history
The toolbox spec changed from 1.7 to 1.8 due to the removal
of tini from the image. The upgrade test was failing on
k8s 1.18 due to this issue.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
  • Loading branch information
travisn committed Dec 8, 2021
1 parent b79950f commit 1e9d4cc
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions tests/integration/ceph_upgrade_test.go
Expand Up @@ -116,7 +116,7 @@ func (s *UpgradeSuite) TestUpgradeRookToMaster() {
}()

//
// Upgrade Rook from v1.6 to master
// Upgrade Rook from v1.7 to master
//
logger.Infof("*** UPGRADING ROOK FROM %s to master ***", installer.Version1_7)
s.gatherLogs(s.settings.OperatorNamespace, "_before_master_upgrade")
Expand All @@ -128,7 +128,7 @@ func (s *UpgradeSuite) TestUpgradeRookToMaster() {
assert.NoError(s.T(), err)

logger.Infof("Done with automatic upgrade from %s to master", installer.Version1_7)
newFile := "post-upgrade-1_6-to-master-file"
newFile := "post-upgrade-1_7-to-master-file"
s.verifyFilesAfterUpgrade(filesystemName, newFile, message, rbdFilesToRead, cephfsFilesToRead)
rbdFilesToRead = append(rbdFilesToRead, newFile)
cephfsFilesToRead = append(cephfsFilesToRead, newFile)
Expand Down Expand Up @@ -421,6 +421,5 @@ func (s *UpgradeSuite) upgradeToMaster() {
require.NoError(s.T(),
s.k8sh.SetDeploymentVersion(s.settings.OperatorNamespace, operatorContainer, operatorContainer, installer.LocalBuildTag))

require.NoError(s.T(),
s.k8sh.SetDeploymentVersion(s.settings.Namespace, "rook-ceph-tools", "rook-ceph-tools", installer.LocalBuildTag))
require.NoError(s.T(), s.k8sh.ResourceOperation("apply", m.GetToolbox()))
}

0 comments on commit 1e9d4cc

Please sign in to comment.