gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cmake,deb,rpm: exclude CI and test directories from installed modules

Browse Source 
The mgr module install rule already excluded tests/*, but that glob only
dropped the files inside tests/ and left an empty tests/ directory in the
installed tree.  The ci/ directories, which hold Dockerfiles, e2e test
scripts, and cluster specs used only for upstream CI pipelines, were not
excluded at all and were shipped by ceph-mgr-dashboard and ceph-mgr-rook.

Change the install pattern from tests/* to tests so the whole directory
is pruned, and add a ci pattern.  Both patterns live in the exclude list
shared by every mgr module install rule (the module list, dashboard, and
rook), so this covers all of them in one place.

This supersedes the per-package excludes added in 8a2e0eb2fc and
d74b88500b, so drop them from ceph.spec.in and debian/rules.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>
This commit is contained in:
Kefu Chai 2026-06-21 16:14:49 +08:00
parent fb5c994f92
commit 9a7299c455
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph.spec.in
View File

@ -2345,7 +2345,6 @@ fi
%files mgr-dashboard
%{_datadir}/ceph/mgr/dashboard
%exclude %{_datadir}/ceph/mgr/dashboard/ci
%ceph_mgr_module_scripts mgr-dashboard
@ -2466,7 +2465,6 @@ fi
%files mgr-rook
%{_datadir}/ceph/mgr/rook
%exclude %{_datadir}/ceph/mgr/rook/ci
%ceph_mgr_module_scripts mgr-rook
@ -2477,7 +2475,6 @@ fi
%files mgr-cephadm
%{_datadir}/ceph/mgr/cephadm
%exclude %{_datadir}/ceph/mgr/cephadm/tests
%ceph_mgr_module_scripts mgr-cephadm

5
debian/rules vendored
View File

@ -158,10 +158,7 @@ override_dh_python3:
dh_python3 -p ceph-fuse --shebang=/usr/bin/python3
dh_python3 -p ceph-volume --shebang=/usr/bin/python3
override_dh_install:
dh_install --exclude=mgr/cephadm/tests --exclude=mgr/dashboard/ci --exclude=mgr/rook/ci
# do not run tests
override_dh_auto_test:
.PHONY: override_dh_autoreconf override_dh_auto_configure override_dh_auto_clean override_dh_auto_install override_dh_installlogrotate override_dh_installinit override_dh_install override_dh_strip override_dh_auto_test
.PHONY: override_dh_autoreconf override_dh_auto_configure override_dh_auto_clean override_dh_auto_install override_dh_installlogrotate override_dh_installinit override_dh_strip override_dh_auto_test

3
src/pybind/mgr/CMakeLists.txt
View File

@ -4,7 +4,8 @@ set(mgr_module_install_excludes
PATTERN "tox.ini" EXCLUDE
PATTERN "requirements*.txt" EXCLUDE
PATTERN "constraints*.txt" EXCLUDE
PATTERN "tests/*" EXCLUDE)
PATTERN "tests" EXCLUDE
PATTERN "ci" EXCLUDE)
add_subdirectory(dashboard)