Differential D1048

Add the ability to build without EPEL packages
ClosedPublic
Actions

Authored by mprahl on Nov 7 2016, 7:32 PM.

Details

Reviewers
tflink
jskladan
Commits
rRSDBe86dbd5b92e8: Add the ability to build without EPEL packages
Summary

When we build the ResultsDB package internally we are not able to use EPEL packages, and thus, the build fails.
This allows the builder to toggle the without_epel macro, which will allow for internal builds without a lot of altering on the spec file.

Test Plan

I tested a build with without_epel turned on and it worked as expected. Someone will need to test this for when without_epel is turned off.

Diff Detail

Repository
rRSDB resultsdb
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mprahl retitled this revision from to Add the ability to build without EPEL packages.Nov 7 2016, 7:32 PM
mprahl updated this object.
mprahl edited the test plan for this revision. (Show Details)
mprahl added reviewers: tflink, jskladan.
jskladan requested changes to this revision.Nov 7 2016, 8:42 PM

The double negatio in all the if-clauses is kind of hard to process for me. Might be because of the fact that I'm not a native speaker, but something like %global epel_available 0 and %if 0%{?epel_available} would be much more readable for me. (And this is why I'm "Requesting Changes").

I also have a question about the problem overall - is this a problem only for internal builds, or is this generally a problem of RHEL? Because if it's a Fedora vs. RHEL thing, then the epel_available (or without_epel as it is now) macro seems a bit unnecessary, and %if 0%{?fedora} instead of the %if !0%{?without_epel} would feel much cleaner, and would also prevent us from needing a separate EPEL branch just because a macro needs to have a different value (this I might be misunderstanding, but the "there needs to be an epel branch" was said in an email conversation that I was part of, and I'm not sure whether this is _the_ solution, or a thing done to not need it).

This revision now requires changes to proceed.Nov 7 2016, 8:42 PM
mprahl added a comment.Nov 7 2016, 8:46 PM

@jskladan: @tflink requested that the macro be by that name. I'm open to changing it once we have a consensus.

I'm not a packaging expert by any means, but as I understand it, this is only because internal builds don't allow EPEL packages during the build process, and is not specific to RHEL.

jskladan added a comment.Nov 7 2016, 9:06 PM

Ah, OK, never mind me then - I don't really do packaging at all, so this was more of "It's hard to parse, maybe this was over-engineered" since that sure happens to me all the time :)

tflink accepted this revision.Jan 10 2017, 6:04 AM

I'm not dead set on without_epel. That macro name made sense to me because that's what's being switched - supporting epel or not. If the general consensus is that %if 0%{?fedora} is more readable, that's with me.

Otherwise the specfile looks good to me.

mprahl added a comment.Jan 10 2017, 1:38 PM

So does this need changes after all?

mprahl added a comment.Jan 18 2017, 8:34 PM

@tflink @jskladan Any updates on this?

jskladan added a comment.Jan 19 2017, 8:06 AM

I guess you can merge it? @tflink is happy with it, and I don't really do packaging that much to be really opinionated.

jskladan added a comment.Jan 20 2017, 1:00 PM

@mprahl I'm not sure whether you have commit access to resultsdb - could not get it from pagure, but it's just me being unable to successfully use it.
If you don't please provide a diff that can be applied on current devel branch, and I'll merge it for you.

mprahl added a comment.EditedJan 20 2017, 1:31 PM

@jskladan, I don't have rights to commit on ResultsDB. I updated the diff. Thank you for your help.

mprahl updated this revision to Diff 2777.Jan 20 2017, 1:43 PM

Updated to be on the latest development branch

jskladan added a subscriber: ralph.Jan 20 2017, 2:49 PM

@mprahl - merging now, sorry for the delay, really forgot that you don't have the commit right, the same as @ralph does

Closed by commit rRSDBe86dbd5b92e8: Add the ability to build without EPEL packages (authored by mprahl <mprahl@redhat.com>, committed by Josef Skladanka <jskladan@redhat.com>). · Explain WhyJan 20 2017, 2:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mresultsdb.spec (14 lines)

Diff 2778

View Options

resultsdb.spec

1​%global without_epel 0
1Name: resultsdb 2​Name: resultsdb
2Version: 2.0.2 3​Version: 2.0.2
3Release: 1%{?dist} 4​Release: 2%{?dist}
4Summary: Results store for automated tasks 5​Summary: Results store for automated tasks
5 6​
6License: GPLv2+ 7​License: GPLv2+
7URL: https://pagure.io/taskotron/resultsdb 8​URL: https://pagure.io/taskotron/resultsdb
8Source0: https://qa.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz 9​Source0: https://qa.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
9 10​
10BuildArch: noarch 11​BuildArch: noarch
11 12​
12Requires: fedmsg >= 0.16.2 13​Requires: fedmsg >= 0.16.2
13Requires: python-alembic >= 0.8.3 14​Requires: python-alembic >= 0.8.3
14Requires: python-flask >= 0.10.1 15​Requires: python-flask >= 0.10.1
15Requires: python-flask-restful >= 0.2.11 16​Requires: python-flask-restful >= 0.2.11
16Requires: python-flask-sqlalchemy >= 2.0 17​Requires: python-flask-sqlalchemy >= 2.0
17Requires: python-iso8601 >= 0.1.10 18​Requires: python-iso8601 >= 0.1.10
18Requires: python-six >= 1.9.0 19​Requires: python-six >= 1.9.0
19Requires: python-sqlalchemy >= 0.9.8 20​Requires: python-sqlalchemy >= 0.9.8
21​# when built on EL without EPEL sources, many of the deps are not available
22​%if !0%{?without_epel}
20BuildRequires: fedmsg >= 0.16.2 23​BuildRequires: fedmsg >= 0.16.2
21BuildRequires: python-alembic >= 0.8.3 24​BuildRequires: python-alembic >= 0.8.3
22BuildRequires: python-flask >= 0.10.1 25​BuildRequires: python-flask >= 0.10.1
23BuildRequires: python-flask-restful >= 0.2.11 26​BuildRequires: python-flask-restful >= 0.2.11
24BuildRequires: python-flask-sqlalchemy >= 2.0 27​BuildRequires: python-flask-sqlalchemy >= 2.0
25BuildRequires: python-iso8601 >= 0.1.10 28​BuildRequires: python-iso8601 >= 0.1.10
26BuildRequires: pytest 29​BuildRequires: pytest
27BuildRequires: python2-devel 30​BuildRequires: python2-devel
31​BuildRequires: python2-setuptools
32​%else
33​BuildRequires: python-devel
28BuildRequires: python-setuptools 34​BuildRequires: python-setuptools
35​%endif
29 36​
30%description 37​%description
31ResultsDB is a results store engine for, but not limited to, Fedora QA tools. 38​ResultsDB is a results store engine for, but not limited to, Fedora QA tools.
32 39​
33%prep 40​%prep
34%setup -q 41​%setup -q
35 42​
43​%if !0%{?without_epel}
36%check 44​%check
37PYTHONPATH=%{buildroot}%{python2_sitelib}/ py.test -F testing/ 45​PYTHONPATH=%{buildroot}%{python2_sitelib}/ py.test -F testing/
38# Remove compiled .py files after running unittests 46​# Remove compiled .py files after running unittests
39rm -f %{buildroot}%{_sysconfdir}/resultsdb/*.py{c,o} 47​rm -f %{buildroot}%{_sysconfdir}/resultsdb/*.py{c,o}
40find %{buildroot}%{_datadir}/resultsdb/alembic -name '*.py[c,o]' -delete 48​find %{buildroot}%{_datadir}/resultsdb/alembic -name '*.py[c,o]' -delete
49​%endif
41 50​
42%build 51​%build
43%{__python2} setup.py build 52​%{__python2} setup.py build
44 53​
45%install 54​%install
46%{__python2} setup.py install --skip-build --root %{buildroot} 55​%{__python2} setup.py install --skip-build --root %{buildroot}
47 56​
48# apache and wsgi settings 57​# apache and wsgi settings
Show All 18 Lines
67%attr(755,root,root) %{_bindir}/resultsdb 76​%attr(755,root,root) %{_bindir}/resultsdb
68%dir %{_sysconfdir}/resultsdb 77​%dir %{_sysconfdir}/resultsdb
69%config(noreplace) %{_sysconfdir}/resultsdb/settings.py 78​%config(noreplace) %{_sysconfdir}/resultsdb/settings.py
70 79​
71%dir %{_datadir}/resultsdb 80​%dir %{_datadir}/resultsdb
72%{_datadir}/resultsdb/* 81​%{_datadir}/resultsdb/*
73 82​
74%changelog 83​%changelog
84​* Fri Jan 20 2017 Matt Prahl <mprahl@redhat.com> - 2.0.2-2
85​- Add the ability to build on RHEL without EPEL by setting the "without_epel" variable to 1
86​
75* Wed Dec 14 2016 Martin Krizek <mkrizek@fedoraproject.org> - 2.0.2-1 87​* Wed Dec 14 2016 Martin Krizek <mkrizek@fedoraproject.org> - 2.0.2-1
76- Make the migration less memory consuming (D1059) 88​- Make the migration less memory consuming (D1059)
77- Flexible messaging (D1061) 89​- Flexible messaging (D1061)
78 90​
79* Tue Nov 22 2016 Martin Krizek <mkrizek@fedoraproject.org> - 2.0.1-1 91​* Tue Nov 22 2016 Martin Krizek <mkrizek@fedoraproject.org> - 2.0.1-1
80- do not replace config file 92​- do not replace config file
81- loosen pin on sqlalchemy in requirements.txt 93​- loosen pin on sqlalchemy in requirements.txt
82- fix the migration, so it deals with duplicate job uuids 94​- fix the migration, so it deals with duplicate job uuids
▲ Show 20 Lines • Show All 83 Lines • Show Last 20 Lines