From eb1e4beff88a8b79850ffa405d81d911c4ada9b3 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Fri, 20 Mar 2020 17:26:22 -0600 Subject: [PATCH 1/2] ceph: run integration tests on latest nautilus Run the tests on latest nautilus with the tag ceph/ceph:v14 so we are constantly testing on the latest release. Signed-off-by: Travis Nielsen --- tests/framework/installer/ceph_installer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index f4d77bc11..824e05b11 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -42,7 +42,7 @@ const ( // test with the latest mimic build mimicTestImage = "ceph/ceph:v13" // test with the latest nautilus build - nautilusTestImage = "ceph/ceph:v14.2.7" + nautilusTestImage = "ceph/ceph:v14" helmChartName = "local/rook-ceph" helmDeployName = "rook-ceph" cephOperatorLabel = "app=rook-ceph-operator" From 9cecf9e4d5b85473013ad0f103346795c66f479d Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 26 Mar 2020 16:59:51 -0600 Subject: [PATCH 2/2] ceph: better attempt in integration tests to wipe the disks The integration tests are failing to run when the disks are not properly cleaned up and the bluestore label is still found. Now we run sgdisk to more completely zap the disk. Signed-off-by: Travis Nielsen --- tests/framework/installer/ceph_installer.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 824e05b11..477dbf82b 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -28,7 +28,6 @@ import ( cephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1" "github.com/rook/rook/pkg/daemon/ceph/client" - "github.com/rook/rook/pkg/operator/k8sutil" "github.com/rook/rook/tests/framework/utils" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" @@ -707,14 +706,6 @@ func (h *CephInstaller) WipeClusterDisks(namespace string) error { // return the error below after cleaning up the jobs err = wait.Poll(5*time.Second, 90*time.Second, allJobsAreComplete) - - // delete the jobs - for _, jobName := range jobNames { - // if delete fails, don't worry about the error; delete only on best-effort basis - wait := false - k8sutil.DeleteBatchJob(h.k8shelper.Clientset, namespace, jobName, wait) - } - if err != nil { return fmt.Errorf("failed to wait for wipe jobs to complete. %+v", err) } @@ -775,6 +766,12 @@ spec: done set -Ee done + # Wipe the specific disk in the CI that was running in raw mode + set +Ee + block=/dev/xvdc + wipefs --all "$block" + dd if=/dev/zero of="$block" bs=1M count=100 oflag=direct,dsync + set -Ee # Useful debug commands lsblk blkid