Skip to content
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

smithfarm
Copy link
Contributor

@smithfarm 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 June 27, 2017 08:04
@smithfarm smithfarm changed the title build/ops: rpm: make pecan+werkzeug conditional upon make_check bcond build/ops: rpm: make pecan+werkzeug BuildRequires conditional upon make_check bcond Jun 27, 2017
@smithfarm smithfarm force-pushed the wip-20425 branch 2 times, most recently from 7ce8770 to b3e54d8 Compare June 27, 2017 08:38
@smithfarm smithfarm changed the title build/ops: rpm: make pecan+werkzeug BuildRequires conditional upon make_check bcond build/ops: rpm: put mgr python build dependencies in make_check Jun 27, 2017
@smithfarm smithfarm changed the title build/ops: rpm: put mgr python build dependencies in make_check build/ops: rpm: put mgr python build dependencies in make_check bcond Jun 27, 2017
@smithfarm
Copy link
Contributor Author

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

Fixes: http://tracker.ceph.com/issues/20425
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: python-cherrypy
BuildRequires: python-werkzeug
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh, right! i missed that!

@smithfarm
Copy link
Contributor Author

Pushed to Shaman: https://shaman.ceph.com/builds/ceph/wip-20425/

@smithfarm
Copy link
Contributor Author

@b-ranto Shaman is green

@liewegas liewegas merged commit 5f51a84 into ceph:master Jul 18, 2017
@smithfarm smithfarm deleted the wip-20425 branch July 18, 2018 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants