diff --git a/.gitignore b/.gitignore index c81d837..324e4de 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /avocado-46.0.tar.gz /avocado-47.0.tar.gz /avocado-48.0.tar.gz +/avocado-49.0.tar.gz diff --git a/python-avocado.spec b/python-avocado.spec index 0f26026..c5e62fe 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -10,10 +10,10 @@ %global gittar %{srcname}-%{version}.tar.gz %else %if ! 0%{?commit:1} -%global commit 337b333e1b58f18f876c993121454f2f6cb599db +%global commit 77df4ae0cf1d7377d98e2950ec04e08f8f5f31a2 %endif %if ! 0%{?commit_date:1} -%global commit_date 20170213 +%global commit_date 20170424 %endif %global shortcommit %(c=%{commit};echo ${c:0:7}) %global gitrel .%{commit_date}git%{shortcommit} @@ -27,7 +27,7 @@ %global with_tests 1 Name: python-%{srcname} -Version: 48.0 +Version: 49.0 Release: 1%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools @@ -53,6 +53,7 @@ BuildRequires: python-docutils BuildRequires: python-flexmock BuildRequires: python-lxml BuildRequires: python2-mock +BuildRequires: python-resultsdb_api %if %{with_tests} BuildRequires: libvirt-python @@ -190,6 +191,17 @@ Docker daemon and attaching to the container itself. Avocado must be previously installed on the container. +%package -n python2-%{srcname}-plugins-resultsdb +Summary: Avocado plugin to propagate job results to ResultsDB +%{?python_provide:%python_provide python2-%{srcname}-plugins-resultsdb} +Requires: python2-%{srcname} == %{version}-%{release} +Requires: python-resultsdb_api + +%description -n python2-%{srcname}-plugins-resultsdb +Allows Avocado to send job results directly to a ResultsDB +server. + + %package -n python-%{srcname}-examples Summary: Avocado Test Framework Example Tests License: GPLv2 @@ -227,6 +239,9 @@ popd pushd optional_plugins/runner_docker %{__python} setup.py build popd +pushd optional_plugins/resultsdb +%{__python} setup.py build +popd %{__make} man %install @@ -243,9 +258,13 @@ popd pushd optional_plugins/runner_docker %{__python2} setup.py install --root %{buildroot} --skip-build popd +pushd optional_plugins/resultsdb +%{__python2} setup.py install --root %{buildroot} --skip-build +popd %{__mkdir_p} %{buildroot}%{_mandir}/man1 %{__install} -m 0644 man/avocado.1 %{buildroot}%{_mandir}/man1/avocado.1 %{__install} -m 0644 man/avocado-rest-client.1 %{buildroot}%{_mandir}/man1/avocado-rest-client.1 +%{__install} -d -m 0755 %{buildroot}%{_sharedstatedir}/avocado/data # relocate examples to documentation directory %{__mkdir_p} %{buildroot}%{_docdir}/avocado %{__mv} %{buildroot}%{_datadir}/avocado/tests %{buildroot}%{_docdir}/avocado/tests @@ -268,6 +287,9 @@ popd pushd optional_plugins/runner_docker %{__python2} setup.py develop --user popd +pushd optional_plugins/resultsdb +%{__python2} setup.py develop --user +popd selftests/run %endif @@ -295,6 +317,7 @@ selftests/run %{_bindir}/avocado-rest-client %{_mandir}/man1/avocado.1.gz %{_mandir}/man1/avocado-rest-client.1.gz +%dir %{_sharedstatedir}/avocado %dir %{_docdir}/avocado %{_docdir}/avocado/avocado.rst %{_docdir}/avocado/avocado-rest-client.rst @@ -326,12 +349,20 @@ selftests/run %{python2_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python2_version}.egg-info +%files -n python2-%{srcname}-plugins-resultsdb +%{python2_sitelib}/avocado_resultsdb/ +%{python2_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python2_version}.egg-info + + %files -n python-%{srcname}-examples %dir %{_docdir}/avocado %{_docdir}/avocado/tests %{_docdir}/avocado/wrappers %changelog +* Tue Apr 25 2017 Merlin Mathesius - 49.0-1 +- Sync with upstream release 49.0. (BZ#1431413) + * Tue Apr 18 2017 Merlin Mathesius - 48.0-1 - Sync with upstream release 48.0. (BZ#1431413) - Allow rel_build macro to be defined outside of the SPEC file. diff --git a/sources b/sources index bbd8d23..c9de22c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (avocado-48.0.tar.gz) = 6838b515824d9219e76ba7084a6706ed17ed5ae83e8d705b83cdfe725926b97b204263b4f79afad49fe958304ed0e6ab39dba8bb77d0fce9793065d4783fcb51 +SHA512 (avocado-49.0.tar.gz) = 73927bb039bc477deaf18d28a8898a17ab60947fb35f609f8aea0e4703fac6f56cde1577bd04cb827ca6282af5f8d6fc39a3958008e58286d37c4f20c3bdee4b