From 1e9d4cc31f0c37c0e065eacf51ff2c23612dd4ec Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Tue, 7 Dec 2021 17:00:22 -0700 Subject: [PATCH] test: upgrade test to update the toolbox spec 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 --- tests/integration/ceph_upgrade_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/integration/ceph_upgrade_test.go b/tests/integration/ceph_upgrade_test.go index 53a74c353ab3..06a5e4253bb1 100644 --- a/tests/integration/ceph_upgrade_test.go +++ b/tests/integration/ceph_upgrade_test.go @@ -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") @@ -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) @@ -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())) }