qa/cephadm: ignore CEPHADM_STRAY_DAEMON in upgrade tests

There is some other ongoing work to make it so daemons
created/destroyed in the last minute are not marked stray
as there can be a delay between when cephadm considers the
daemon as being removed and when the core mgr reports the
same. Unfortunately, that change only fixes it for releases
in which the patch will be present, so the upgrade test
is still susceptible to having these warnings pop up
before the upgrade occurs.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit c4a875f6810923e0efb5ed752b5df3ec1b2f4633)

diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml
index ac93a456cb6b31aaf6aeae2195e7fd041e459b86..5da510cb56349d5f105f9c81ab6172ec98a273e9 100644 (file)
--- a/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml
+++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/simple.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-ignorelist:
+      - CEPHADM_STRAY_DAEMON
     log-only-match:
       - CEPHADM_
 tasks:

diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml
index f1fd9f039bb8fbbb2883007556f5d5af66fed0e7..c78d3b4c2935bb213d6379c986886439841895e1 100644 (file)
--- a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml
+++ b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml
@@ -1,5 +1,7 @@
 overrides:
   ceph:
+    log-ignorelist:
+      - CEPHADM_STRAY_DAEMON
     log-only-match:
       - CEPHADM_
 tasks: