Merge PR ceph#59029 into main

batrick · batrick · commit cfed7c0baac6 · 2024-08-07T20:58:17.000-04:00
* refs/pull/59029/head:
	qa: simplify postmerge construction

Reviewed-by: Samuel Just &lt;sjust@redhat.com&gt;
Reviewed-by: Brad Hubbard &lt;bhubbard@redhat.com&gt;
diff --git 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
@@ -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
@@ -1,4 +1,3 @@
-clusternodes: 1
 overrides:
   ceph-deploy:
     conf:
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-clusternodes: 2`
`2`	`1`	`roles:`
`3`	`2`	`- [mgr.x, mon.a, mon.c, mds.a, mds.c, osd.0, client.0]`
`4`	`3`	`- [mgr.y, mgr.z, mon.b, mds.b, osd.1, osd.2, osd.3, client.1]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-clusternodes: 1`
`2`	`1`	`overrides:`
`3`	`2`	`ceph-deploy:`
`4`	`3`	`conf:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-clusternodes: 4`
`2`	`1`	`roles:`
`3`	`2`	`- [mon.a, mgr.y, osd.0, osd.4, osd.8, osd.12]`
`4`	`3`	`- [mon.b, osd.1, osd.5, osd.9, osd.13]`