From: Nitzan Mordechai <nmordech@redhat.com>
Date: Tue, 4 Jun 2024 06:33:05 +0000 (+0000)
Subject: suites/ec-rados-plugin=jerasure-k=8-m=6-crush: roles set with overrides
X-Git-Tag: v20.0.0~1364^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5cd5469b261c5927857c15a40fbd2366cb0f277;p=ceph.git

suites/ec-rados-plugin=jerasure-k=8-m=6-crush: roles set with overrides

roles being set without overrides causing too many values to unpack (expected 1)

Fixes: https://tracker.ceph.com/issues/66209
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
---

diff --git a/qa/erasure-code/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml b/qa/erasure-code/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml
index 3cfbcd4e85bc..160e182e92d1 100644
--- a/qa/erasure-code/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml
+++ b/qa/erasure-code/ec-rados-plugin=jerasure-k=2-m=2-crush.yaml
@@ -1,13 +1,3 @@
-roles: 
-- [mon.a, mgr.y, osd.0]
-- [mon.b, osd.1] 
-- [mon.c, osd.2] 
-- [mgr.x, osd.3, client.0]
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd shutdown pgref assert: true
 tasks:
 - rados:
     clients: [client.0]
diff --git a/qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml b/qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
index b131959e02b6..24b92e6aaff3 100644
--- a/qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
+++ b/qa/erasure-code/ec-rados-plugin=jerasure-k=8-m=6-crush.yaml
@@ -1,8 +1,3 @@
-roles:
-- [mon.a, mgr.y, osd.0, osd.4, osd.8, osd.12]
-- [mon.b, osd.1, osd.5, osd.9, osd.13]
-- [mon.c, osd.2, osd.6, osd.10, osd.14]
-- [mgr.x, osd.3, osd.7, osd.11, osd.15, client.0]
 tasks:
 - rados:
     clients: [client.0]
diff --git a/qa/suites/rados/thrash-erasure-code-crush-4-nodes/clusters b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/clusters
new file mode 120000
index 000000000000..7aac47be3e6a
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-crush-4-nodes/clusters
@@ -0,0 +1 @@
+../thrash/clusters
\ No newline at end of file