From: Sage Weil <sage@newdream.net>
Date: Fri, 16 Apr 2021 19:12:49 +0000 (-0500)
Subject: qa/tasks/cephadm: ignore --keep-logs failure
X-Git-Tag: v16.2.2~1^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=57e7652d3ed657767c6f7c58f707ae3bb26359ab;p=ceph.git

qa/tasks/cephadm: ignore --keep-logs failure

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 65f2848e978b3ef3908124dfbfbeed1f7bf52087)
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 4b0d26b228a3..c1b6970c8674 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -481,14 +481,17 @@ def ceph_bootstrap(ctx, config):
                 raise
 
         # tear down anything left (but leave the logs behind)
-        ctx.cluster.run(args=[
-            'sudo',
-            ctx.cephadm,
-            'rm-cluster',
-            '--fsid', fsid,
-            '--force',
-            '--keep-logs',
-        ])
+        ctx.cluster.run(
+            args=[
+                'sudo',
+                ctx.cephadm,
+                'rm-cluster',
+                '--fsid', fsid,
+                '--force',
+                '--keep-logs',
+            ],
+            check_status=False,  # may fail if upgrading from old cephadm
+        )
 
         # clean up /etc/ceph
         ctx.cluster.run(args=[