From 23498cf09d76752f2285ae0bf4b35a66f1ebd200 Mon Sep 17 00:00:00 2001 From: travisn Date: Fri, 8 Feb 2019 08:33:23 -0700 Subject: [PATCH] tests: smoke suite runs on nautilus Signed-off-by: travisn --- tests/framework/installer/ceph_installer.go | 7 +++++-- tests/integration/smoke_test.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 924debdc7..99051f030 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -43,13 +43,16 @@ const ( luminousTestImage = "ceph/ceph:v12" // test with the latest mimic build mimicTestImage = "ceph/ceph:v13" - helmChartName = "local/rook-ceph" - helmDeployName = "rook-ceph" + // test with the latest master build until nautilus is released + nautilusTestImage = "ceph/daemon-base:latest-master" + helmChartName = "local/rook-ceph" + helmDeployName = "rook-ceph" ) var ( LuminousVersion = cephv1.CephVersionSpec{Image: luminousTestImage} MimicVersion = cephv1.CephVersionSpec{Image: mimicTestImage} + NautilusVersion = cephv1.CephVersionSpec{Image: nautilusTestImage, AllowUnsupported: true} ) // CephInstaller wraps installing and uninstalling rook on a platform diff --git a/tests/integration/smoke_test.go b/tests/integration/smoke_test.go index f9f34fb81..1e7614167 100644 --- a/tests/integration/smoke_test.go +++ b/tests/integration/smoke_test.go @@ -70,7 +70,7 @@ func (suite *SmokeSuite) SetupSuite() { useDevices := true mons := 3 rbdMirrorWorkers := 1 - suite.op, suite.k8sh = StartTestCluster(suite.T, suite.namespace, "bluestore", false, useDevices, mons, rbdMirrorWorkers, installer.VersionMaster, installer.MimicVersion) + suite.op, suite.k8sh = StartTestCluster(suite.T, suite.namespace, "bluestore", false, useDevices, mons, rbdMirrorWorkers, installer.VersionMaster, installer.NautilusVersion) suite.helper = clients.CreateTestClient(suite.k8sh, suite.op.installer.Manifests) }