qa/suites/upgrade: use common ignorelist

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit b2ac7f6561326f7020159e43737ef8e9fe9248aa)
Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
Conflicts:
	qa/suites/upgrade/reef-x/parallel/+
	qa/suites/upgrade/reef-x/parallel/overrides/+
	qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml
	qa/suites/upgrade/reef-x/parallel/upgrade_ignorelist_health.yaml
	qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml

Resolution: tentacle -> reef. Added tentacle-p2p

diff --git a/qa/overrides/upgrade_ignorelist_health.yaml b/qa/overrides/upgrade_ignorelist_health.yaml
new file mode 100644 (file)
index 0000000..96c27c5
--- /dev/null
+++ b/qa/overrides/upgrade_ignorelist_health.yaml
@@ -0,0 +1,22 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - \(MDS_ALL_DOWN\)
+      - \(MDS_UP_LESS_THAN_MAX\)
+      - \(OSD_SLOW_PING_TIME
+      - reached quota
+      - overall HEALTH_
+      - \(CACHE_POOL_NO_HIT_SET\)
+      - \(POOL_FULL\)
+      - \(SMALLER_PGP_NUM\)
+      - \(SLOW_OPS\)
+      - \(CACHE_POOL_NEAR_FULL\)
+      - \(POOL_APP_NOT_ENABLED\)
+      - \(PG_AVAILABILITY\)
+      - \(OBJECT_MISPLACED\)
+      - slow request
+      - \(MON_DOWN\)
+      - noscrub
+      - nodeep-scrub
+      - running out of quota
+      - pool\(s\) full

diff --git a/qa/suites/upgrade/reef-x/parallel/+ b/qa/suites/upgrade/reef-x/parallel/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/reef-x/parallel/overrides/+ b/qa/suites/upgrade/reef-x/parallel/overrides/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml b/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml
deleted file mode 100644 (file)
index fa93b2f..0000000
--- a/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - MDS_ALL_DOWN
-      - MDS_UP_LESS_THAN_MAX
-      - OSD_SLOW_PING_TIME
-      - reached quota
-      - running out of quota
-      - overall HEALTH_
-      - CACHE_POOL_NO_HIT_SET
-      - pool\(s\) full
-      - POOL_FULL
-      - SMALLER_PGP_NUM
-      - SLOW_OPS
-      - CACHE_POOL_NEAR_FULL
-      - OBJECT_MISPLACED
-      - slow request
-      - noscrub
-      - nodeep-scrub

diff --git a/qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml
new file mode 120000 (symlink)
index 0000000..00fe2d6
--- /dev/null
+++ b/qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml
@@ -0,0 +1 @@
+.qa/overrides/upgrade_ignorelist_health.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml b/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml
deleted file mode 100644 (file)
index fa93b2f..0000000
--- a/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - MDS_ALL_DOWN
-      - MDS_UP_LESS_THAN_MAX
-      - OSD_SLOW_PING_TIME
-      - reached quota
-      - running out of quota
-      - overall HEALTH_
-      - CACHE_POOL_NO_HIT_SET
-      - pool\(s\) full
-      - POOL_FULL
-      - SMALLER_PGP_NUM
-      - SLOW_OPS
-      - CACHE_POOL_NEAR_FULL
-      - OBJECT_MISPLACED
-      - slow request
-      - noscrub
-      - nodeep-scrub

diff --git a/qa/suites/upgrade/reef-x/stress-split/overrides/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/reef-x/stress-split/overrides/upgrade_ignorelist_health.yaml
new file mode 120000 (symlink)
index 0000000..00fe2d6
--- /dev/null
+++ b/qa/suites/upgrade/reef-x/stress-split/overrides/upgrade_ignorelist_health.yaml
@@ -0,0 +1 @@
+.qa/overrides/upgrade_ignorelist_health.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/squid-x/parallel/overrides/+ b/qa/suites/upgrade/squid-x/parallel/overrides/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml b/qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml
deleted file mode 100644 (file)
index 96c27c5..0000000
--- a/qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - \(MDS_ALL_DOWN\)
-      - \(MDS_UP_LESS_THAN_MAX\)
-      - \(OSD_SLOW_PING_TIME
-      - reached quota
-      - overall HEALTH_
-      - \(CACHE_POOL_NO_HIT_SET\)
-      - \(POOL_FULL\)
-      - \(SMALLER_PGP_NUM\)
-      - \(SLOW_OPS\)
-      - \(CACHE_POOL_NEAR_FULL\)
-      - \(POOL_APP_NOT_ENABLED\)
-      - \(PG_AVAILABILITY\)
-      - \(OBJECT_MISPLACED\)
-      - slow request
-      - \(MON_DOWN\)
-      - noscrub
-      - nodeep-scrub
-      - running out of quota
-      - pool\(s\) full

diff --git a/qa/suites/upgrade/squid-x/parallel/overrides/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/squid-x/parallel/overrides/upgrade_ignorelist_health.yaml
new file mode 120000 (symlink)
index 0000000..00fe2d6
--- /dev/null
+++ b/qa/suites/upgrade/squid-x/parallel/overrides/upgrade_ignorelist_health.yaml
@@ -0,0 +1 @@
+.qa/overrides/upgrade_ignorelist_health.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/squid-x/stress-split/overrides/+ b/qa/suites/upgrade/squid-x/stress-split/overrides/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml b/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml
deleted file mode 100644 (file)
index 96c27c5..0000000
--- a/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - \(MDS_ALL_DOWN\)
-      - \(MDS_UP_LESS_THAN_MAX\)
-      - \(OSD_SLOW_PING_TIME
-      - reached quota
-      - overall HEALTH_
-      - \(CACHE_POOL_NO_HIT_SET\)
-      - \(POOL_FULL\)
-      - \(SMALLER_PGP_NUM\)
-      - \(SLOW_OPS\)
-      - \(CACHE_POOL_NEAR_FULL\)
-      - \(POOL_APP_NOT_ENABLED\)
-      - \(PG_AVAILABILITY\)
-      - \(OBJECT_MISPLACED\)
-      - slow request
-      - \(MON_DOWN\)
-      - noscrub
-      - nodeep-scrub
-      - running out of quota
-      - pool\(s\) full

diff --git a/qa/suites/upgrade/squid-x/stress-split/overrides/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/squid-x/stress-split/overrides/upgrade_ignorelist_health.yaml
new file mode 120000 (symlink)
index 0000000..00fe2d6
--- /dev/null
+++ b/qa/suites/upgrade/squid-x/stress-split/overrides/upgrade_ignorelist_health.yaml
@@ -0,0 +1 @@
+.qa/overrides/upgrade_ignorelist_health.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-parallel/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-parallel/upgrade_ignorelist_health.yaml
new file mode 120000 (symlink)
index 0000000..00fe2d6
--- /dev/null
+++ b/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-parallel/upgrade_ignorelist_health.yaml
@@ -0,0 +1 @@
+.qa/overrides/upgrade_ignorelist_health.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-stress-split/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-stress-split/upgrade_ignorelist_health.yaml
new file mode 120000 (symlink)
index 0000000..00fe2d6
--- /dev/null
+++ b/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-stress-split/upgrade_ignorelist_health.yaml
@@ -0,0 +1 @@
+.qa/overrides/upgrade_ignorelist_health.yaml
\ No newline at end of file