From a01b9821ee2a3a97533dffd22b8c2e675f3670e2 Mon Sep 17 00:00:00 2001
From: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Date: Thu, 30 Sep 2021 12:41:57 +0530
Subject: [PATCH] e2e: set rbd-nbd mounter tests cephLogStrategy to preserve

This is to preserve the rbd-nbd logs post unmap, so that the CI can dump
the available logs from logdir.

Fixes: #2451
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
---
 e2e/rbd.go | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/e2e/rbd.go b/e2e/rbd.go
index b26b4f072..e5fb66380 100644
--- a/e2e/rbd.go
+++ b/e2e/rbd.go
@@ -60,7 +60,8 @@ var (
 	snapshotPath           = rbdExamplePath + "snapshot.yaml"
 	defaultCloneCount      = 10
 
-	nbdMapOptions = "debug-rbd=20"
+	nbdMapOptions             = "debug-rbd=20"
+	e2eDefaultCephLogStrategy = "preserve"
 )
 
 func deployRBDPlugin() {
@@ -477,8 +478,9 @@ var _ = Describe("RBD", func() {
 					defaultSCName,
 					nil,
 					map[string]string{
-						"mounter":    "rbd-nbd",
-						"mapOptions": nbdMapOptions,
+						"mounter":         "rbd-nbd",
+						"mapOptions":      nbdMapOptions,
+						"cephLogStrategy": e2eDefaultCephLogStrategy,
 					},
 					deletePolicy)
 				if err != nil {
@@ -513,8 +515,9 @@ var _ = Describe("RBD", func() {
 						defaultSCName,
 						nil,
 						map[string]string{
-							"mounter":    "rbd-nbd",
-							"mapOptions": nbdMapOptions,
+							"mounter":         "rbd-nbd",
+							"mapOptions":      nbdMapOptions,
+							"cephLogStrategy": e2eDefaultCephLogStrategy,
 						},
 						deletePolicy)
 					if err != nil {
@@ -558,8 +561,9 @@ var _ = Describe("RBD", func() {
 					defaultSCName,
 					nil,
 					map[string]string{
-						"mounter":    "rbd-nbd",
-						"mapOptions": nbdMapOptions,
+						"mounter":         "rbd-nbd",
+						"mapOptions":      nbdMapOptions,
+						"cephLogStrategy": e2eDefaultCephLogStrategy,
 					},
 					deletePolicy)
 				if err != nil {
@@ -712,9 +716,10 @@ var _ = Describe("RBD", func() {
 					defaultSCName,
 					nil,
 					map[string]string{
-						"mounter":    "rbd-nbd",
-						"mapOptions": nbdMapOptions,
-						"encrypted":  "true",
+						"mounter":         "rbd-nbd",
+						"mapOptions":      nbdMapOptions,
+						"cephLogStrategy": e2eDefaultCephLogStrategy,
+						"encrypted":       "true",
 					},
 					deletePolicy)
 				if err != nil {
@@ -1069,9 +1074,10 @@ var _ = Describe("RBD", func() {
 						defaultSCName,
 						nil,
 						map[string]string{
-							"imageFeatures": "layering,journaling,exclusive-lock",
-							"mounter":       "rbd-nbd",
-							"mapOptions":    nbdMapOptions,
+							"imageFeatures":   "layering,journaling,exclusive-lock",
+							"mounter":         "rbd-nbd",
+							"mapOptions":      nbdMapOptions,
+							"cephLogStrategy": e2eDefaultCephLogStrategy,
 						},
 						deletePolicy)
 					if err != nil {