From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 5 Aug 2024 20:54:22 +0000 (-0400)
Subject: qa: simplify postmerge construction
X-Git-Tag: v20.0.0~1309^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F59029%2Fhead;p=ceph.git

qa: simplify postmerge construction

and avoid errors when "clusternodes" is not defined.

Fixes: https://tracker.ceph.com/issues/67352
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/clusters/2-node-mgr.yaml b/qa/clusters/2-node-mgr.yaml
index be657492c1ec..b1c29a866385 100644
--- a/qa/clusters/2-node-mgr.yaml
+++ b/qa/clusters/2-node-mgr.yaml
@@ -1,4 +1,3 @@
-clusternodes: 2
 roles:
 - [mgr.x, mon.a, mon.c, mds.a, mds.c, osd.0, client.0]
 - [mgr.y, mgr.z, mon.b, mds.b, osd.1, osd.2, osd.3, client.1]
diff --git a/qa/clusters/extra-client.yaml b/qa/clusters/extra-client.yaml
index 4bf258bcd419..d3da15f33a69 100644
--- a/qa/clusters/extra-client.yaml
+++ b/qa/clusters/extra-client.yaml
@@ -1,4 +1,3 @@
-clusternodes: 2
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2]
 - [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5]
diff --git a/qa/clusters/fixed-1.yaml b/qa/clusters/fixed-1.yaml
index a7cf5db3d69d..d8e5898b99f4 100644
--- a/qa/clusters/fixed-1.yaml
+++ b/qa/clusters/fixed-1.yaml
@@ -1,4 +1,3 @@
-clusternodes: 1
 overrides:
   ceph-deploy:
     conf:
diff --git a/qa/clusters/fixed-2.yaml b/qa/clusters/fixed-2.yaml
index 964d6a49b2bf..e4448bb20088 100644
--- a/qa/clusters/fixed-2.yaml
+++ b/qa/clusters/fixed-2.yaml
@@ -1,4 +1,3 @@
-clusternodes: 2
 roles:
 - [mon.a, mon.c, mgr.y, osd.0, osd.1, osd.2, osd.3, client.0, node-exporter.a]
 - [mon.b, mgr.x, osd.4, osd.5, osd.6, osd.7, client.1, prometheus.a, node-exporter.b]
diff --git a/qa/clusters/fixed-3-cephfs.yaml b/qa/clusters/fixed-3-cephfs.yaml
index 493b044eb998..9e021b3bd69b 100644
--- a/qa/clusters/fixed-3-cephfs.yaml
+++ b/qa/clusters/fixed-3-cephfs.yaml
@@ -1,4 +1,3 @@
-clusternodes: 2
 roles:
 - [mon.a, mds.a, mgr.x, osd.0, osd.1]
 - [mon.b, mds.b, mon.c, mgr.y, osd.2, osd.3]
diff --git a/qa/clusters/fixed-3.yaml b/qa/clusters/fixed-3.yaml
index e87ae9392375..ddc79a84b60c 100644
--- a/qa/clusters/fixed-3.yaml
+++ b/qa/clusters/fixed-3.yaml
@@ -1,4 +1,3 @@
-clusternodes: 2
 roles:
 - [mon.a, mon.c, mgr.x, osd.0, osd.1, osd.2, osd.3]
 - [mon.b, mgr.y, osd.4, osd.5, osd.6, osd.7]
diff --git a/qa/clusters/fixed-4.yaml b/qa/clusters/fixed-4.yaml
index eef1d54fdd3f..59587bb110a9 100644
--- a/qa/clusters/fixed-4.yaml
+++ b/qa/clusters/fixed-4.yaml
@@ -1,4 +1,3 @@
-clusternodes: 4
 roles: 
 - [mon.a, mgr.y, osd.0, osd.4, osd.8, osd.12]
 - [mon.b, osd.1, osd.5, osd.9, osd.13] 
diff --git a/qa/suites/rados/thrash/workloads/rados_api_tests.yaml b/qa/suites/rados/thrash/workloads/rados_api_tests.yaml
index 97520e6a8cc8..bc53736c74f0 100644
--- a/qa/suites/rados/thrash/workloads/rados_api_tests.yaml
+++ b/qa/suites/rados/thrash/workloads/rados_api_tests.yaml
@@ -1,7 +1,8 @@
 teuthology:
   postmerge:
-    # Don't run this test on tiny clusters
-    - if yaml.clusternodes < 4 then reject() end
+    - |
+      -- Don't run this test on tiny clusters
+      if py_len(yaml.roles) < 4 then reject() end
 overrides:
   ceph:
     log-ignorelist:
diff --git a/qa/suites/rados/verify/tasks/rados_api_tests.yaml b/qa/suites/rados/verify/tasks/rados_api_tests.yaml
index d23eda8cf10b..6ad646328749 100644
--- a/qa/suites/rados/verify/tasks/rados_api_tests.yaml
+++ b/qa/suites/rados/verify/tasks/rados_api_tests.yaml
@@ -1,7 +1,8 @@
 teuthology:
   postmerge:
-    # Don't run this test on tiny clusters
-    - if yaml.clusternodes < 4 then reject() end
+    - |
+      -- Don't run this test on tiny clusters
+      if py_len(yaml.roles) < 4 then reject() end
 overrides:
   ceph:
     log-ignorelist: