New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rpm,deb: fix ceph-volume #16832

Merged
merged 2 commits into from Aug 6, 2017

Conversation

Projects
None yet
2 participants
@liewegas
Member

liewegas commented Aug 4, 2017

No description provided.

debian: include ceph-volume python
Be careful not to grab ceph_volume_client.py

Signed-off-by: Sage Weil <sage@redhat.com>

@liewegas liewegas added this to the luminous milestone Aug 4, 2017

@smithfarm

LGTM, thanks

@smithfarm smithfarm requested a review from alfredodeza Aug 4, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Aug 4, 2017

The patch shown on IRC contained this:

diff --git a/src/boost b/src/boost
--- a/src/boost
+++ b/src/boost
@@ -1 +1 @@
-Subproject commit 1790aff3b34374d2af85f8c16755d101f49d2b6e
+Subproject commit 1790aff3b34374d2af85f8c16755d101f49d2b6e-dirty

Could that be causing the Unmodified Submodules test to fail? I don't see that part of the patch in the PR, though.

@liewegas

This comment has been minimized.

Member

liewegas commented Aug 4, 2017

I think maybe jenkins is just overloaded atm....

@@ -967,7 +967,8 @@ rm -rf %{buildroot}
%{_unitdir}/ceph.target
%{python_sitelib}/ceph_detect_init*
%{python_sitelib}/ceph_disk*
%{python_sitelib}/ceph_volume*

This comment has been minimized.

@smithfarm

smithfarm Aug 5, 2017

Contributor

%dir %{python_sitelib}/ceph_volume

Otherwise build fails with

[ 4618s] ceph-base-12.1.2+git.1501876501.4c219a30d6-1.1.x86_64.rpm: directories not owned by a package:
[ 4618s]  - /usr/lib/python2.7/site-packages/ceph_volume
@smithfarm

%{python_sitelib}/ceph_volume/ directory needs to be owned by the package

@liewegas

This comment has been minimized.

Member

liewegas commented Aug 6, 2017

@smithfarm better?

@liewegas liewegas merged commit 0b5267e into ceph:master Aug 6, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details

@liewegas liewegas deleted the liewegas:wip-20915 branch Aug 6, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment