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

build/ops: rpm: put mgr python build dependencies in make_check bcond #15940

Merged
merged 2 commits into from Jul 18, 2017

Conversation

Projects
None yet
5 participants
@smithfarm
Contributor

smithfarm commented Jun 27, 2017

Fixes: http://tracker.ceph.com/issues/20425

Quoting from the tracker:

Some dependencies - notably the mgr dependencies "python-cherrypy", "python-pecan" and "python-werkzeug" - are only needed to run "make check". Since these dependencies bring in a pretty long list of packages (dependencies of dependencies of dependencies. . .) it would make sense to put them inside the "make_check" bcond so RPM builds that do not run "make check" (the default) would not pull in all these python modules that are not used.

There is one wrinkle, though: the bcond is "off" by default, so install-deps.sh will need to activate it before parsing the spec file for dependencies, otherwise "run-make-check.sh" will fail due to missing dependencies.

Note that this is RPM-only (at least for now) since the "make_check" bcond itself if RPM-only.

@smithfarm smithfarm requested a review from liewegas Jun 27, 2017

@smithfarm smithfarm changed the title from build/ops: rpm: make pecan+werkzeug conditional upon make_check bcond to build/ops: rpm: make pecan+werkzeug BuildRequires conditional upon make_check bcond Jun 27, 2017

@smithfarm smithfarm added the build/ops label Jun 27, 2017

@smithfarm smithfarm changed the title from build/ops: rpm: make pecan+werkzeug BuildRequires conditional upon make_check bcond to build/ops: rpm: put mgr python build dependencies in make_check Jun 27, 2017

@smithfarm smithfarm changed the title from build/ops: rpm: put mgr python build dependencies in make_check to build/ops: rpm: put mgr python build dependencies in make_check bcond Jun 27, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 27, 2017

Do we know of any other build dependencies that are only needed for "make check" and could be moved into the conditional?

@smithfarm smithfarm referenced this pull request Jul 17, 2017

Merged

mon: add support public_bind_addr option #16189

3 of 3 tasks complete

@smithfarm smithfarm requested review from tchaikov, ktdreyer and b-ranto Jul 17, 2017

smithfarm added some commits Jun 27, 2017

build/ops: rpm: put mgr python build dependencies in make_check bcond
Fixes: http://tracker.ceph.com/issues/20425
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
build/ops: rpm: socat is only needed for "make check"
Signed-off-by: Nathan Cutler <ncutler@suse.com>
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: python-cherrypy
BuildRequires: python-werkzeug

This comment has been minimized.

@tchaikov

tchaikov Jul 17, 2017

Contributor

the dashboard ceph-mgr plugin depends on cherrypy at run-time, and the restful plugin depends on werkzeug.

so we need them unless they are packaged separately.

This comment has been minimized.

@tserong

tserong Jul 17, 2017

Contributor

They're still there as runtime Requires, so that should be fine...?

This comment has been minimized.

@b-ranto

b-ranto Jul 17, 2017

Contributor

This just moves the build-time dependencies, the runtime dependencies are still in place. I would like to see a full jenkins builder job for this though.

This comment has been minimized.

@tchaikov

tchaikov Jul 17, 2017

Contributor

ahh, right! i missed that!

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jul 17, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jul 17, 2017

@b-ranto Shaman is green

@liewegas liewegas merged commit 5f51a84 into ceph:master Jul 18, 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

@smithfarm smithfarm deleted the smithfarm:wip-20425 branch Jul 18, 2018

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