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 be657492c1ec892650f47147fb359e5e703f8a2b..b1c29a866385e2a84f3fb72faa571c6a8a156652 100644 (file)
--- 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 4bf258bcd41907781ca2f894567248874370cbd0..d3da15f33a699c6d825cb7f7781f09c7d085faa2 100644 (file)
--- 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 a7cf5db3d69d24fc8afa930101cb3c370a3097e1..d8e5898b99f4afacb3625d573a64f9a285e8ec66 100644 (file)
--- 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 964d6a49b2bf8c85613e06cf503f2ef5dddc84cf..e4448bb2008834ec3e0480e0a9d83070be48b818 100644 (file)
--- 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 493b044eb998a6b6b95eb02ca473d264bb33d8cd..9e021b3bd69bc67158b3129737f9769ba04d1a5b 100644 (file)
--- 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 e87ae93923750a230abc2a4bd07725982db18b48..ddc79a84b60c64ec7bcfd8227fd6953d571e04e2 100644 (file)
--- 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 eef1d54fdd3fe3323a8285023dbb227f15c667b2..59587bb110a91db5077f3d5257e0daf39a24d460 100644 (file)
--- 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 97520e6a8cc879b6e0b6860078eea7e7aa7cb5a0..bc53736c74f0f80ebe72e5211e2e486ce7e2aa96 100644 (file)
--- 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 d23eda8cf10b4c23879e948e72ec3fd47b99dda8..6ad6463287497a0a67b18591bbbcf46fef816fe8 100644 (file)
--- 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: