qa/suites/upgrade: s/whitelist/ignorelist for octopus only

some upgrade tests are only present for octopus and not for master and
hence we missed updating the ignorelist terminology for those cases.

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
index 5c5fdc0b2c5fb15d1c71370194325a046be596d0..b245534eb02a9dca5e790d454df87c1d223a951f 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml
@@ -1,7 +1,7 @@
 overrides:
   ceph:
     mon_bind_msgr2: false
-    log-whitelist:
+    log-ignorelist:
       - \(MON_DOWN\)
     conf:
       global:

diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
index fea79d4a70b04c3fe8e6ba6426d78f1d68bfb3d0..c74015b09c0b0d511d8b76e1bb851db44d991f6f 100644 (file)
--- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
+++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml
@@ -1,7 +1,7 @@
 overrides:
   ceph:
     mon_bind_msgr2: false
-    log-whitelist:
+    log-ignorelist:
       - \(MON_DOWN\)
     conf:
       global:

diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
index c631b0ed2dfb5fe58b59af4b29a8c7f81c361b41..8354b1772bdd95a809d53ff6f734b369bdacff03 100644 (file)
--- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
+++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml
@@ -16,6 +16,6 @@ roles:
 - - client.1
 overrides:
   ceph:
-    #log-whitelist:
+    #log-ignorelist:
       #- failed to encode map
     fs: xfs

diff --git a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml
index bfc14e560afab577992b8cf6a53ae86389e5d027..f1ae68180b79f6b307ead53ee396f325f6ec4ba1 100644 (file)
--- a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml
@@ -1,6 +1,6 @@
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
       - \(MON_DOWN\)
       - \(MGR_DOWN\)
       - slow request

diff --git a/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml b/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml
index e36882da43fad2542ed0e88314c53486d6cefad9..5360e867fcca329d61b24662feac5422346ff248 100644 (file)
--- a/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml
+++ b/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml
@@ -4,7 +4,7 @@ meta:
    small chance to increase the number of pgs
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
     - but it is still running
     - objects unfound and apparently lost
     - log bound mismatch

diff --git a/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml b/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml
index e7fa4b2f47c6fcbd2a1612f802f11d111a823be1..3f72ccaa6820bc559e3fd0159d375aec48991713 100644 (file)
--- a/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml
+++ b/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml
@@ -4,7 +4,7 @@ meta:
     restartin remaining osds
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
       - overall HEALTH_
       - \(FS_DEGRADED\)
       - \(MDS_

diff --git a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
index 099b70c30d8fde97e12644895deb1ceaad27c30a..f7f8f4a980d4fd954618fe5195deeee2b1e18ff8 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml
@@ -29,7 +29,7 @@ overrides:
   ceph:
     mon_bind_msgr2: false
     mon_bind_addrvec: false
-    log-whitelist:
+    log-ignorelist:
     - scrub mismatch
     - ScrubResult
     - wrongly marked

diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
index f4a882583aace98334e1e4449555f78e8c95ee48..0abc11e7f5d077a2b32c7ce79c4635c660697882 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
@@ -16,7 +16,7 @@ tasks:
     extra_packages: ['librados2']
 - print: "**** done installing mimic"
 - ceph:
-    log-whitelist:
+    log-ignorelist:
       - overall HEALTH_
       - \(FS_
       - \(MDS_

diff --git a/qa/suites/upgrade/mimic-x/parallel/6-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/mimic-x/parallel/6-final-workload/rados_mon_thrash.yaml
index 129d13866ce574186718ca90fea59edd6ef07e2c..08706dfc177972e2734a275340d611c593807ce9 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/6-final-workload/rados_mon_thrash.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/6-final-workload/rados_mon_thrash.yaml
@@ -3,7 +3,7 @@ meta:
    librados C and C++ api tests
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
       - reached quota
       - \(REQUEST_SLOW\)
 tasks:

diff --git a/qa/suites/upgrade/mimic-x/stress-split-erasure-code/3-thrash/default.yaml b/qa/suites/upgrade/mimic-x/stress-split-erasure-code/3-thrash/default.yaml
index b12d76e9fe6f8fdfd5eeb3fee0b7d26358a445d3..4f15c64848b84e2927f3ba1be72e5f09535e8e02 100644 (file)
--- a/qa/suites/upgrade/mimic-x/stress-split-erasure-code/3-thrash/default.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split-erasure-code/3-thrash/default.yaml
@@ -4,7 +4,7 @@ meta:
    small chance to increase the number of pgs
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
     - but it is still running
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml
index 433f35345670e69851326dd5896872156abaae17..2583082bba88d19de874f9e890af625d5a3d4139 100644 (file)
--- a/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml
@@ -11,7 +11,7 @@ overrides:
     mon_bind_msgr2: false
     mon_bind_addrvec: false
     fs: xfs
-    log-whitelist:
+    log-ignorelist:
       - overall HEALTH_
       - \(MON_DOWN\)
       - \(MGR_DOWN\)

diff --git a/qa/suites/upgrade/mimic-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/mimic-x/stress-split/3-thrash/default.yaml
index e0f317b0c1adacffc8a7dcdf12892ffbee6dee51..2be9c1f29ac759c1391b660c5dd7311443e67f8d 100644 (file)
--- a/qa/suites/upgrade/mimic-x/stress-split/3-thrash/default.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/3-thrash/default.yaml
@@ -4,7 +4,7 @@ meta:
    small chance to increase the number of pgs
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
     - but it is still running
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml b/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml
index 165076b017b2ebabc16c0ce134c4809f3291f66b..ad97ea42246db15acc8523a0ddc03361381a7fbf 100644 (file)
--- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml
@@ -11,7 +11,7 @@ meta:
    run workload and upgrade-sequence in parallel
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
     - reached quota
     - scrub
     - osd_map_max_advance

diff --git a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/0-cluster/start.yaml b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/0-cluster/start.yaml
index 5ebce3ced08a6e20ff8acac7d7347bc35614d1ba..1271edd8b9196bd22f2acb916ea5fd96b6a94b3e 100644 (file)
--- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/0-cluster/start.yaml
+++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/0-cluster/start.yaml
@@ -6,7 +6,7 @@ meta:
 overrides:
   ceph:
     fs: xfs
-    log-whitelist:
+    log-ignorelist:
       - overall HEALTH_
       - \(MON_DOWN\)
       - \(MGR_DOWN\)

diff --git a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/3-thrash/default.yaml b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/3-thrash/default.yaml
index 49e6f84f86aff268731e2a92588fb5d4c44b4b50..c739d8fea2bb81971800e36df4ecacaf3b578a74 100644 (file)
--- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/3-thrash/default.yaml
+++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/3-thrash/default.yaml
@@ -4,7 +4,7 @@ meta:
    small chance to increase the number of pgs
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
     - but it is still running
     - wrongly marked me down
     - objects unfound and apparently lost

diff --git a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/thrashosds-health.yaml b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/thrashosds-health.yaml
index 914f6e25ee55967c8a1b10aaf106d3c8e27eaa4a..9903fa578afe9dc7f11d7908c87bf368b642c7fe 100644 (file)
--- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/thrashosds-health.yaml
+++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/thrashosds-health.yaml
@@ -1,6 +1,6 @@
 overrides:
   ceph:
-    log-whitelist:
+    log-ignorelist:
       - overall HEALTH_
       - \(OSDMAP_FLAGS\)
       - \(OSD_