Sync with upstream release 50.0. (BZ#1431413)

Be explicit about selftest level run on check.
This commit is contained in:
Merlin Mathesius 2017-05-17 10:34:11 -05:00
commit 2b43620ea8
3 changed files with 51 additions and 43 deletions

1
.gitignore vendored
View file

@ -3,3 +3,4 @@
/avocado-47.0.tar.gz
/avocado-48.0.tar.gz
/avocado-49.0.tar.gz
/avocado-50.0.tar.gz

View file

@ -2,32 +2,32 @@
# Conditional for release vs. snapshot builds. Set to 1 for release build.
%if ! 0%{?rel_build:1}
%global rel_build 1
%global rel_build 1
%endif
# Settings used for build from snapshots.
%if 0%{?rel_build}
%global gittar %{srcname}-%{version}.tar.gz
%global gittar %{srcname}-%{version}.tar.gz
%else
%if ! 0%{?commit:1}
%global commit 77df4ae0cf1d7377d98e2950ec04e08f8f5f31a2
%endif
%if ! 0%{?commit_date:1}
%global commit_date 20170424
%endif
%global shortcommit %(c=%{commit};echo ${c:0:7})
%global gitrel .%{commit_date}git%{shortcommit}
%global gittar %{srcname}-%{shortcommit}.tar.gz
%if ! 0%{?commit:1}
%global commit 6e726259cb8da6b97af64839a2af3410d1b6f620
%endif
%if ! 0%{?commit_date:1}
%global commit_date 20170516
%endif
%global shortcommit %(c=%{commit};echo ${c:0:7})
%global gitrel .%{commit_date}git%{shortcommit}
%global gittar %{srcname}-%{shortcommit}.tar.gz
%endif
# selftests are provided but may need to skipped because many of
# functional tests are time and resource sensitive and can
# cause race conditions and random build failures. they are
# Selftests are provided but may need to be skipped because many of
# the functional tests are time and resource sensitive and can
# cause race conditions and random build failures. They are
# enabled by default.
%global with_tests 1
Name: python-%{srcname}
Version: 49.0
Version: 50.0
Release: 1%{?gitrel}%{?dist}
Summary: Framework with tools and libraries for Automated Testing
Group: Development/Tools
@ -228,38 +228,38 @@ sed -e "s/'libvirt-python'//" -i optional_plugins/runner_vm/setup.py
%build
%{__python2} setup.py build
pushd optional_plugins/html
%{__python2} setup.py build
%{__python2} setup.py build
popd
pushd optional_plugins/runner_remote
%{__python} setup.py build
%{__python} setup.py build
popd
pushd optional_plugins/runner_vm
%{__python} setup.py build
%{__python} setup.py build
popd
pushd optional_plugins/runner_docker
%{__python} setup.py build
%{__python} setup.py build
popd
pushd optional_plugins/resultsdb
%{__python} setup.py build
%{__python} setup.py build
popd
%{__make} man
%install
%{__python2} setup.py install --root %{buildroot} --skip-build
pushd optional_plugins/html
%{__python2} setup.py install --root %{buildroot} --skip-build
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
pushd optional_plugins/runner_remote
%{__python2} setup.py install --root %{buildroot} --skip-build
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
pushd optional_plugins/runner_vm
%{__python2} setup.py install --root %{buildroot} --skip-build
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
pushd optional_plugins/runner_docker
%{__python2} setup.py install --root %{buildroot} --skip-build
%{__python2} setup.py install --root %{buildroot} --skip-build
popd
pushd optional_plugins/resultsdb
%{__python2} setup.py install --root %{buildroot} --skip-build
%{__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
@ -274,23 +274,26 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
%check
%if %{with_tests}
%{__python2} setup.py develop --user
pushd optional_plugins/html
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_remote
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_vm
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_docker
%{__python2} setup.py develop --user
popd
pushd optional_plugins/resultsdb
%{__python2} setup.py develop --user
popd
selftests/run
%{__python2} setup.py develop --user
pushd optional_plugins/html
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_remote
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_vm
%{__python2} setup.py develop --user
popd
pushd optional_plugins/runner_docker
%{__python2} setup.py develop --user
popd
pushd optional_plugins/resultsdb
%{__python2} setup.py develop --user
popd
# Package build environments have the least amount of resources
# we have observed so far. Let's avoid tests that require too
# much resources or are time sensitive.
AVOCADO_CHECK_LEVEL=0 selftests/run
%endif
%files -n python2-%{srcname}
@ -360,6 +363,10 @@ selftests/run
%{_docdir}/avocado/wrappers
%changelog
* Wed May 17 2017 Merlin Mathesius <mmathesi@redhat.com> - 50.0-1
- Sync with upstream release 50.0. (BZ#1431413)
- Be explicit about selftest level run on check.
* Tue Apr 25 2017 Merlin Mathesius <mmathesi@redhat.com> - 49.0-1
- Sync with upstream release 49.0. (BZ#1431413)

View file

@ -1 +1 @@
SHA512 (avocado-49.0.tar.gz) = 73927bb039bc477deaf18d28a8898a17ab60947fb35f609f8aea0e4703fac6f56cde1577bd04cb827ca6282af5f8d6fc39a3958008e58286d37c4f20c3bdee4b
SHA512 (avocado-50.0.tar.gz) = 0b64e83c5d5bb952ea51e619ea011cac7f0668cf048d89beb265a30996cd3c1c22a43bcfbc1d3f533eec458af0b8bfbe80b5dbe817e8531357bcefc48e867623