From d35ddcbecc16cda28fbd2b0515d7f3f666617d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 19 Apr 2021 17:18:13 +0200 Subject: [PATCH] ceph: use v14 again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since Rook 1.6 is using raw mode for simple OSD scenarios we can use v14 again without having issue with ceph-volume. We keep the upgraade test with v14.2.12 since Rook 1.5 does not have the raw code to deploy OSDs. Closes: https://github.com/rook/rook/issues/7669 Signed-off-by: Sébastien Han --- tests/framework/installer/ceph_installer.go | 14 +++++++++----- tests/integration/ceph_upgrade_test.go | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 20d892aa2..2d5f278ac 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -43,7 +43,10 @@ import ( const ( // test with the latest nautilus build - nautilusTestImage = "ceph/ceph:v14.2.12" + nautilusTestImage = "ceph/ceph:v14" + // nautilusTestImagePartition is the image that contains working ceph-volume code to deploy OSDs on partitions + // currently only used for the upgrade test from 1.5 to 1.6, this cannot be changed to v14 since ceph-volume will fail to deploy OSD on partition on Rook 1.5 + nautilusTestImagePartition = "ceph/ceph:v14.2.12" // test with the latest octopus build octopusTestImage = "ceph/ceph:v15" // test with the latest pacific build @@ -55,10 +58,11 @@ const ( ) var ( - NautilusVersion = cephv1.CephVersionSpec{Image: nautilusTestImage} - OctopusVersion = cephv1.CephVersionSpec{Image: octopusTestImage} - PacificVersion = cephv1.CephVersionSpec{Image: pacificTestImage} - MasterVersion = cephv1.CephVersionSpec{Image: masterTestImage, AllowUnsupported: true} + NautilusVersion = cephv1.CephVersionSpec{Image: nautilusTestImage} + NautilusPartitionVersion = cephv1.CephVersionSpec{Image: nautilusTestImagePartition} + OctopusVersion = cephv1.CephVersionSpec{Image: octopusTestImage} + PacificVersion = cephv1.CephVersionSpec{Image: pacificTestImage} + MasterVersion = cephv1.CephVersionSpec{Image: masterTestImage, AllowUnsupported: true} ) // CephInstaller wraps installing and uninstalling rook on a platform diff --git a/tests/integration/ceph_upgrade_test.go b/tests/integration/ceph_upgrade_test.go index 7dcd6ead9..87391f66a 100644 --- a/tests/integration/ceph_upgrade_test.go +++ b/tests/integration/ceph_upgrade_test.go @@ -85,7 +85,7 @@ func (s *UpgradeSuite) SetupSuite() { UseCSI: true, SkipOSDCreation: false, RookVersion: installer.Version1_5, - CephVersion: installer.NautilusVersion, + CephVersion: installer.NautilusPartitionVersion, } s.installer, s.k8sh = StartTestCluster(s.T, s.settings, upgradeMinimalTestVersion)