From: Sage Weil <sage@newdream.net>
Date: Mon, 8 Nov 2021 15:29:41 +0000 (-0600)
Subject: qa/suites/big: update for cephadm
X-Git-Tag: v17.1.0~367^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0514b0a323dcc1319693dbcbb65f83620181979d;p=ceph.git

qa/suites/big: update for cephadm

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/suites/big/rados-thrash/ceph/ceph.yaml b/qa/suites/big/rados-thrash/ceph/ceph.yaml
deleted file mode 100644
index 2030acb90836..000000000000
--- a/qa/suites/big/rados-thrash/ceph/ceph.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:
diff --git a/qa/suites/big/rados-thrash/ceph/cephadm.yaml b/qa/suites/big/rados-thrash/ceph/cephadm.yaml
new file mode 100644
index 000000000000..a225422c5a32
--- /dev/null
+++ b/qa/suites/big/rados-thrash/ceph/cephadm.yaml
@@ -0,0 +1,8 @@
+overrides:
+  kernel:
+    hwe: true
+tasks:
+- install:
+- nvme_loop:
+- cephadm:
+    roleless: true
diff --git a/qa/suites/big/rados-thrash/clusters/big.yaml b/qa/suites/big/rados-thrash/clusters/big.yaml
index fd8c2174118e..d9a8de8e76e4 100644
--- a/qa/suites/big/rados-thrash/clusters/big.yaml
+++ b/qa/suites/big/rados-thrash/clusters/big.yaml
@@ -1,68 +1,68 @@
 roles:
-- [osd.0, osd.1, osd.2, client.0, mon.a, mgr.x]
-- [osd.3, osd.4, osd.5, client.1, mon.b, mgr.y]
-- [osd.6, osd.7, osd.8, client.2, mon.c, mgr.z]
-- [osd.9, osd.10, osd.11, client.3, mon.d]
-- [osd.12, osd.13, osd.14, client.4, mon.e]
-- [osd.15, osd.16, osd.17, client.5]
-- [osd.18, osd.19, osd.20, client.6]
-- [osd.21, osd.22, osd.23, client.7]
-- [osd.24, osd.25, osd.26, client.8]
-- [osd.27, osd.28, osd.29, client.9]
-- [osd.30, osd.31, osd.32, client.10]
-- [osd.33, osd.34, osd.35, client.11]
-- [osd.36, osd.37, osd.38, client.12]
-- [osd.39, osd.40, osd.41, client.13]
-- [osd.42, osd.43, osd.44, client.14]
-- [osd.45, osd.46, osd.47, client.15]
-- [osd.48, osd.49, osd.50, client.16]
-- [osd.51, osd.52, osd.53, client.17]
-- [osd.54, osd.55, osd.56, client.18]
-- [osd.57, osd.58, osd.59, client.19]
-- [osd.60, osd.61, osd.62, client.20]
-- [osd.63, osd.64, osd.65, client.21]
-- [osd.66, osd.67, osd.68, client.22]
-- [osd.69, osd.70, osd.71, client.23]
-- [osd.72, osd.73, osd.74, client.24]
-- [osd.75, osd.76, osd.77, client.25]
-- [osd.78, osd.79, osd.80, client.26]
-- [osd.81, osd.82, osd.83, client.27]
-- [osd.84, osd.85, osd.86, client.28]
-- [osd.87, osd.88, osd.89, client.29]
-- [osd.90, osd.91, osd.92, client.30]
-- [osd.93, osd.94, osd.95, client.31]
-- [osd.96, osd.97, osd.98, client.32]
-- [osd.99, osd.100, osd.101, client.33]
-- [osd.102, osd.103, osd.104, client.34]
-- [osd.105, osd.106, osd.107, client.35]
-- [osd.108, osd.109, osd.110, client.36]
-- [osd.111, osd.112, osd.113, client.37]
-- [osd.114, osd.115, osd.116, client.38]
-- [osd.117, osd.118, osd.119, client.39]
-- [osd.120, osd.121, osd.122, client.40]
-- [osd.123, osd.124, osd.125, client.41]
-- [osd.126, osd.127, osd.128, client.42]
-- [osd.129, osd.130, osd.131, client.43]
-- [osd.132, osd.133, osd.134, client.44]
-- [osd.135, osd.136, osd.137, client.45]
-- [osd.138, osd.139, osd.140, client.46]
-- [osd.141, osd.142, osd.143, client.47]
-- [osd.144, osd.145, osd.146, client.48]
-- [osd.147, osd.148, osd.149, client.49]
-- [osd.150, osd.151, osd.152, client.50]
-#- [osd.153, osd.154, osd.155, client.51]
-#- [osd.156, osd.157, osd.158, client.52]
-#- [osd.159, osd.160, osd.161, client.53]
-#- [osd.162, osd.163, osd.164, client.54]
-#- [osd.165, osd.166, osd.167, client.55]
-#- [osd.168, osd.169, osd.170, client.56]
-#- [osd.171, osd.172, osd.173, client.57]
-#- [osd.174, osd.175, osd.176, client.58]
-#- [osd.177, osd.178, osd.179, client.59]
-#- [osd.180, osd.181, osd.182, client.60]
-#- [osd.183, osd.184, osd.185, client.61]
-#- [osd.186, osd.187, osd.188, client.62]
-#- [osd.189, osd.190, osd.191, client.63]
-#- [osd.192, osd.193, osd.194, client.64]
-#- [osd.195, osd.196, osd.197, client.65]
-#- [osd.198, osd.199, osd.200, client.66]
+- [host.a, client.0]
+- [host.b, client.1]
+- [host.c, client.2]
+- [host.d, client.3]
+- [host.e, client.4]
+- [host.f, client.5]
+- [host.g, client.6]
+- [host.h, client.7]
+- [host.i, client.8]
+- [host.j, client.9]
+- [host.k, client.10]
+- [host.l, client.11]
+- [host.m, client.12]
+- [host.n, client.13]
+- [host.o, client.14]
+- [host.p, client.15]
+- [host.q, client.16]
+- [host.r, client.17]
+- [host.s, client.18]
+- [host.t, client.19]
+- [host.u, client.20]
+- [host.v, client.21]
+- [host.w, client.22]
+- [host.x, client.23]
+- [host.y, client.24]
+- [host.z, client.25]
+- [host.aa, client.26]
+- [host.ab, client.27]
+- [host.ac, client.28]
+- [host.ad, client.29]
+- [host.ae, client.30]
+- [host.af, client.31]
+- [host.ag, client.32]
+- [host.ah, client.33]
+- [host.ai, client.34]
+- [host.aj, client.35]
+- [host.ak, client.36]
+- [host.al, client.37]
+- [host.am, client.38]
+- [host.an, client.39]
+- [host.ao, client.40]
+- [host.ap, client.41]
+- [host.aq, client.42]
+- [host.ar, client.43]
+- [host.as, client.44]
+- [host.at, client.45]
+- [host.au, client.46]
+- [host.av, client.47]
+- [host.aw, client.48]
+- [host.ax, client.49]
+- [host.ay, client.50]
+- [host.az, client.51]
+- [host.ba, client.52]
+- [host.bb, client.53]
+- [host.bc, client.54]
+- [host.bd, client.55]
+- [host.be, client.56]
+- [host.bf, client.57]
+- [host.bg, client.58]
+- [host.bh, client.59]
+- [host.bi, client.60]
+- [host.bj, client.61]
+- [host.bk, client.62]
+- [host.bl, client.63]
+- [host.bm, client.64]
+- [host.bn, client.65]
+- [host.bo, client.66]
diff --git a/qa/suites/big/rados-thrash/clusters/medium.yaml b/qa/suites/big/rados-thrash/clusters/medium.yaml
index ecded01b4ff9..05a16b053359 100644
--- a/qa/suites/big/rados-thrash/clusters/medium.yaml
+++ b/qa/suites/big/rados-thrash/clusters/medium.yaml
@@ -1,22 +1,22 @@
 roles:
-- [osd.0, osd.1, osd.2, client.0, mon.a, mgr.x]
-- [osd.3, osd.4, osd.5, client.1, mon.b, mgr.y]
-- [osd.6, osd.7, osd.8, client.2, mon.c, mgr.z]
-- [osd.9, osd.10, osd.11, client.3, mon.d]
-- [osd.12, osd.13, osd.14, client.4, mon.e]
-- [osd.15, osd.16, osd.17, client.5]
-- [osd.18, osd.19, osd.20, client.6]
-- [osd.21, osd.22, osd.23, client.7]
-- [osd.24, osd.25, osd.26, client.8]
-- [osd.27, osd.28, osd.29, client.9]
-- [osd.30, osd.31, osd.32, client.10]
-- [osd.33, osd.34, osd.35, client.11]
-- [osd.36, osd.37, osd.38, client.12]
-- [osd.39, osd.40, osd.41, client.13]
-- [osd.42, osd.43, osd.44, client.14]
-- [osd.45, osd.46, osd.47, client.15]
-- [osd.48, osd.49, osd.50, client.16]
-- [osd.51, osd.52, osd.53, client.17]
-- [osd.54, osd.55, osd.56, client.18]
-- [osd.57, osd.58, osd.59, client.19]
-- [osd.60, osd.61, osd.62, client.20]
+- [host.a, client.0]
+- [host.b, client.1]
+- [host.c, client.2]
+- [host.d, client.3]
+- [host.e, client.4]
+- [host.f, client.5]
+- [host.g, client.6]
+- [host.h, client.7]
+- [host.i, client.8]
+- [host.j, client.9]
+- [host.k, client.10]
+- [host.l, client.11]
+- [host.m, client.12]
+- [host.n, client.13]
+- [host.o, client.14]
+- [host.p, client.15]
+- [host.q, client.16]
+- [host.r, client.17]
+- [host.s, client.18]
+- [host.t, client.19]
+- [host.u, client.20]
diff --git a/qa/suites/big/rados-thrash/clusters/small.yaml b/qa/suites/big/rados-thrash/clusters/small.yaml
index d0aecd00875f..0ff9f33f1f3a 100644
--- a/qa/suites/big/rados-thrash/clusters/small.yaml
+++ b/qa/suites/big/rados-thrash/clusters/small.yaml
@@ -1,6 +1,6 @@
 roles:
-- [osd.0, osd.1, osd.2, client.0, mon.a, mgr.x]
-- [osd.3, osd.4, osd.5, client.1, mon.b, mgr.y]
-- [osd.6, osd.7, osd.8, client.2, mon.c, mgr.z]
-- [osd.9, osd.10, osd.11, client.3, mon.d]
-- [osd.12, osd.13, osd.14, client.4, mon.e]
+- [host.a, client.0]
+- [host.b, client.1]
+- [host.c, client.2]
+- [host.d, client.3]
+- [host.e, client.4]
diff --git a/qa/suites/big/rados-thrash/objectstore b/qa/suites/big/rados-thrash/objectstore
deleted file mode 120000
index 848c65f9e131..000000000000
--- a/qa/suites/big/rados-thrash/objectstore
+++ /dev/null
@@ -1 +0,0 @@
-.qa/objectstore_debug
\ No newline at end of file
diff --git a/qa/suites/big/rados-thrash/workloads/radosbench.yaml b/qa/suites/big/rados-thrash/workloads/radosbench.yaml
new file mode 100644
index 000000000000..60f72886cc96
--- /dev/null
+++ b/qa/suites/big/rados-thrash/workloads/radosbench.yaml
@@ -0,0 +1,3 @@
+tasks:
+- radosbench:
+    time: 300