@@ -189,15 +189,14 @@ def install_deps(self):
189189 # number
190190 log .info (f'distro and version detected is "{ distro } " and "{ version } ".' )
191191
192- # we keep fedora here so that right deps are installed when this test
193- # is run locally by a dev.
194- if distro in ('redhatenterpriseserver' , 'redhatenterprise' , 'fedora' ,
195- 'centos' , 'centosstream' , 'rhel' ):
196- deps = """acl attr automake bc dbench dump e2fsprogs fio \
197- gawk gcc indent libtool lvm2 make psmisc quota sed \
198- xfsdump xfsprogs \
199- libacl-devel libattr-devel libaio-devel libuuid-devel \
200- xfsprogs-devel btrfs-progs-devel python3 sqlite""" .split ()
192+ if distro in ('redhatenterpriseserver' , 'redhatenterprise' , 'centos' ,
193+ 'centosstream' , 'rhel' ):
194+ deps = """\
195+ acl attr automake bc dbench dump e2fsprogs fio gawk gcc \
196+ gdbm-devel git indent kernel-devel libacl-devel \
197+ libaio-devel libcap-devel libtool libuuid-devel lvm2 \
198+ make psmisc python3 quota sed sqlite udftools \
199+ xfsprogs""" .split ()
201200
202201 if self .install_xfsprogs :
203202 if distro == 'centosstream' and major_ver_num == 8 :
@@ -206,25 +205,46 @@ def install_deps(self):
206205 'gettext' , 'libedit-devel' , 'libattr-devel' ,
207206 'device-mapper-devel' , 'libicu-devel' ]
208207
209- deps_old_distros = ['xfsprogs-qa-devel' ]
210-
211- if distro != 'fedora' and major_ver_num > 7 :
212- deps .remove ('btrfs-progs-devel' )
213-
214- args = ['sudo' , 'yum' , 'install' , '-y' ] + deps + deps_old_distros
208+ args = ['sudo' , 'yum' , 'install' , '-y' ] + deps
209+ elif distro == 'fedora' :
210+ deps = """\
211+ acl attr automake bc dbench dump e2fsprogs fio gawk gcc \
212+ gdbm-devel git indent kernel-devel libacl-devel \
213+ libaio-devel libcap-devel libtool liburing-devel \
214+ libuuid-devel lvm2 make psmisc python3 quota sed sqlite \
215+ udftools xfsprogs \
216+ \
217+ btrfs-progs exfatprogs f2fs-tools ocfs2-tools xfsdump \
218+ xfsprogs-devel""" .split ()
219+
220+ args = ['sudo' , 'yum' , 'install' , '-y' ] + deps
215221 elif distro == 'ubuntu' :
216- deps = """xfslibs-dev uuid-dev libtool-bin \
217- e2fsprogs automake gcc libuuid1 quota attr libattr1-dev make \
218- libacl1-dev libaio-dev xfsprogs libgdbm-dev gawk fio dbench \
219- uuid-runtime python sqlite3""" .split ()
222+ deps = """\
223+ acl attr automake bc dbench dump e2fsprogs fio gawk \
224+ gcc git indent libacl1-dev libaio-dev libcap-dev \
225+ libgdbm-dev libtool libtool-bin liburing-dev libuuid1 \
226+ lvm2 make psmisc python3 quota sed uuid-dev uuid-runtime \
227+ xfsprogs sqlite3 \
228+ \
229+ exfatprogs f2fs-tools ocfs2-tools udftools xfsdump \
230+ xfslibs-dev""" .split ()
231+ # NOTE: Acc to xfstests-dev project's README we need the
232+ # following package, but it is not available for machines
233+ # where CephFS tests are run, since a custom version of
234+ # kernel is installed for testing. The default version of
235+ # kernel that comes with OS. Since all tests in generic
236+ # test-suite are running fine without this packages, no
237+ # effort is being made to build and install this package
238+ # before running tests from xfstests-dev.
239+ #
240+ # + [f'linux-headers-{k_rel}']
241+ # k_rel stands for kernel release number.
220242
221243 if self .install_xfsprogs :
222244 deps += ['libinih-dev' , 'liburcu-dev' , 'libblkid-dev' ,
223245 'gettext' , 'libedit-dev' , 'libattr1-dev' ,
224246 'libdevmapper-dev' , 'libicu-dev' , 'pkg-config' ]
225247
226- if major_ver_num >= 19 :
227- deps [deps .index ('python' )] = 'python2'
228248 args = ['sudo' , 'apt-get' , 'install' , '-y' ] + deps
229249 else :
230250 raise RuntimeError ('expected a yum based or a apt based system' )
0 commit comments