openstack/rpm-packaging
Code Issues Proposed changes

monasca-common: switch to confluent-kafka

Browse Source 
Also move to stestr and conditionalize confluent-kafka
for now as it is not available on RDO yet

Change-Id: I0bed19456b411b3d89d4275ecc46b3b0fe370bb9
This commit is contained in:
Dirk Mueller
2018-12-11 23:39:22 +01:00
committed by Thomas Bechtold
parent 931d2d4fcf
commit 89e72e2412
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
openstack/monasca-common/monasca-common.spec.j2
View File

@@ -16,7 +16,6 @@ BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('PyMySQL') }} BuildRequires: {{ py2pkg('PyMySQL') }}
BuildRequires: {{ py2pkg('kazoo') }} BuildRequires: {{ py2pkg('kazoo') }}
BuildRequires: {{ py2pkg('mock') }} BuildRequires: {{ py2pkg('mock') }}
BuildRequires: {{ py2pkg('os-testr') }}
BuildRequires: {{ py2pkg('oslo.config') }} BuildRequires: {{ py2pkg('oslo.config') }}
BuildRequires: {{ py2pkg('oslo.context') }} BuildRequires: {{ py2pkg('oslo.context') }}
BuildRequires: {{ py2pkg('oslo.policy') }} BuildRequires: {{ py2pkg('oslo.policy') }}
@@ -26,21 +25,19 @@ BuildRequires: {{ py2pkg('pyparsing') }}
BuildRequires: {{ py2pkg('requests-mock') }} BuildRequires: {{ py2pkg('requests-mock') }}
BuildRequires: {{ py2pkg('setuptools') }} BuildRequires: {{ py2pkg('setuptools') }}
BuildRequires: {{ py2pkg('six') }} BuildRequires: {{ py2pkg('six') }}
BuildRequires: {{ py2pkg('stestr') }}
BuildRequires: {{ py2pkg('ujson') }} BuildRequires: {{ py2pkg('ujson') }}
Requires: {{ py2pkg('PyMySQL') }} Requires: {{ py2pkg('PyMySQL') }}
Requires: {{ py2pkg('kazoo') }} Requires: {{ py2pkg('kazoo') }}
Requires: {{ py2pkg('oslo.config') }} Requires: {{ py2pkg('oslo.config') }}
Requires: {{ py2pkg('oslo.policy') }} Requires: {{ py2pkg('oslo.policy') }}
Requires: {{ py2pkg('pykafka') }}
Requires: {{ py2pkg('pyparsing') }} Requires: {{ py2pkg('pyparsing') }}
Requires: {{ py2pkg('six') }} Requires: {{ py2pkg('six') }}
Requires: {{ py2pkg('ujson') }} Requires: {{ py2pkg('ujson') }}
BuildArch: noarch BuildArch: noarch
%if "%{version}" != "2.3.0" %if 0%{?suse_version}
# Currently monasca vendored kafka and will only eventually BuildRequires: {{ py2pkg('confluent-kafka') }}
# switch to pykafka. atm it is not used Requires: {{ py2pkg('confluent-kafka') }}
BuildRequires: {{ py2pkg('pykafka') }}
Requires: {{ py2pkg('pykafka') }}
%endif %endif
%description %description
@@ -57,8 +54,10 @@ platform code for building monitoring related services.
%install %install
%{py2_install} %{py2_install}
%if 0%{?suse_version}
%check %check
ostestr stestr run
%endif
%files %files
%license LICENSE %license LICENSE