From: Guillaume Abrioux <gabrioux@ibm.com>
Date: Wed, 11 Feb 2026 13:17:22 +0000 (+0000)
Subject: Merge branch 'wip-shraddhaag-cephadm-crimson-tests' of https://github.com/shraddhaag... 
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84a80275f63e26ece3f633fd033fd9ecbda16ed2;p=ceph-ci.git

Merge branch 'wip-shraddhaag-cephadm-crimson-tests' of https://github.com/shraddhaag/ceph into wip-guits-main-2026-02-11-1316
---

84a80275f63e26ece3f633fd033fd9ecbda16ed2
diff --cc src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
index 575273140fb,d34e8cde06f..0720602d876
--- a/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
+++ b/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
@@@ -116,25 -125,24 +126,44 @@@ class TestBaseObjectStore
                            '--setgroup', 'ceph']
  
      @patch('ceph_volume.conf.cluster', 'ceph')
 +    def test_build_osd_mkfs_cmd_disables_discard(self):
 +        bo = BaseObjectStore([])
 +        bo.osd_path = '/var/lib/ceph/osd/ceph-123/'
 +        bo.osd_fsid = 'abcd-1234'
 +        bo.objectstore = 'bluestore'
 +        bo.osd_id = '123'
 +        bo.monmap = '/etc/ceph/ceph.monmap'
 +        bo.skip_mkfs_discard = True
 +        result = bo.build_osd_mkfs_cmd()
 +
 +        assert result == ['ceph-osd',
 +                          '--cluster',
 +                          'ceph',
 +                          '--osd-objectstore',
 +                          'bluestore',
 +                          '--mkfs', '-i', '123',
 +                          '--monmap',
 +                          '/etc/ceph/ceph.monmap',
 +                          '--bdev-enable-discard', 'false',
++
+     def test_build_osd_mkfs_cmd_crimson(self):
+         bo = BaseObjectStore([])
+         bo.osd_path = '/var/lib/ceph/osd/ceph-123/'
+         bo.osd_fsid = 'abcd-1234'
+         bo.objectstore = 'my-fake-objectstore'
+         bo.osd_id = '123'
+         bo.monmap = '/etc/ceph/ceph.monmap'
+         bo.osd_type = 'crimson'
+         result = bo.build_osd_mkfs_cmd()
+ 
+         assert result == ['ceph-osd-crimson',
+                           '--cluster',
+                           'ceph',
+                           '--osd-objectstore',
+                           'my-fake-objectstore',
+                           '--mkfs', '-i', '123',
+                           '--monmap',
+                           '/etc/ceph/ceph.monmap',
                            '--keyfile', '-',
                            '--osd-data',
                            '/var/lib/ceph/osd/ceph-123/',
@@@ -235,4 -217,4 +264,4 @@@
          monkeypatch.setattr('ceph_volume.util.system.chown', lambda path: 0)
          self.b.get_osdspec_affinity = lambda: 'foo'
          self.b.add_objectstore_opts()
--        assert self.b.osd_mkfs_cmd == ['binary', 'arg1', '--osdspec-affinity', 'foo']
++        assert self.b.osd_mkfs_cmd == ['binary', 'arg1', '--osdspec-affinity', 'foo']