ceph: use v14 again
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 <seb@redhat.com>
This commit is contained in:
1 parent
f4cfc7a03d
commit
d35ddcbecc
2 files changed
+10
-6
No files matched your search
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user