Sync with upstream release 79.0.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
This commit is contained in:
Cleber Rosa
parent
ccb9faa20d
commit
c0e14dbafa
3 changed files with 49 additions and 23 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -25,3 +25,4 @@
|
|||
/avocado-76.0.tar.gz
|
||||
/avocado-77.0.tar.gz
|
||||
/avocado-78.0.tar.gz
|
||||
/avocado-79.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
%global gittar %{srcname}-%{version}.tar.gz
|
||||
%else
|
||||
%if ! 0%{?commit:1}
|
||||
%global commit b8ce4cf8a9e9f7935eb3e43186ad7dfcd84092c3
|
||||
%global commit 232cdefdcb4e850669c18607563791a94a068309
|
||||
%endif
|
||||
%if ! 0%{?commit_date:1}
|
||||
%global commit_date 20200414
|
||||
%global commit_date 20200511
|
||||
%endif
|
||||
%global shortcommit %(c=%{commit};echo ${c:0:8})
|
||||
%global gitrel .%{commit_date}git%{shortcommit}
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
%endif
|
||||
|
||||
Name: python-%{pkgname}
|
||||
Version: 78.0
|
||||
Version: 79.0
|
||||
Release: 1%{?gitrel}%{?dist}
|
||||
Summary: Framework with tools and libraries for Automated Testing
|
||||
Group: Development/Tools
|
||||
|
|
@ -85,7 +85,8 @@ BuildRequires: python3-pycdlib
|
|||
%if %{with_python3_fabric}
|
||||
BuildRequires: python3-fabric3
|
||||
%endif
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
%if %{with_resultsdb}
|
||||
BuildRequires: python3-resultsdb_api
|
||||
%endif
|
||||
|
|
@ -107,7 +108,8 @@ BuildRequires: python3-libvirt
|
|||
%else
|
||||
BuildRequires: libvirt-python3
|
||||
%endif
|
||||
%endif # with_tests
|
||||
%endif
|
||||
# with_tests
|
||||
|
||||
%description
|
||||
Avocado is a set of tools and libraries (what people call
|
||||
|
|
@ -133,21 +135,24 @@ pushd optional_plugins/runner_remote
|
|||
%if %{with_python3_fabric}
|
||||
%py3_build
|
||||
%endif
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/runner_vm
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_build
|
||||
%endif
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/runner_docker
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_build
|
||||
%endif
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/resultsdb
|
||||
%if %{with_resultsdb}
|
||||
|
|
@ -207,21 +212,24 @@ pushd optional_plugins/runner_remote
|
|||
%if %{with_python3_fabric}
|
||||
%py3_install
|
||||
%endif
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/runner_vm
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_install
|
||||
%endif
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/runner_docker
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_install
|
||||
%endif
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/resultsdb
|
||||
%if %{with_resultsdb}
|
||||
|
|
@ -296,13 +304,16 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
|
|||
pushd optional_plugins/runner_docker
|
||||
%{__python3} setup.py develop --user
|
||||
popd
|
||||
%endif # with_python3_fabric
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_python3_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
%if %{with_resultsdb}
|
||||
pushd optional_plugins/resultsdb
|
||||
%{__python3} setup.py develop --user
|
||||
popd
|
||||
%endif # with_resultsdb
|
||||
%endif
|
||||
# with_resultsdb
|
||||
pushd optional_plugins/varianter_yaml_to_mux
|
||||
%{__python3} setup.py develop --user
|
||||
popd
|
||||
|
|
@ -334,7 +345,7 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
|
|||
# use the one that was setup in the source tree by the "setup.py
|
||||
# develop --user" step and is guaranteed to be version specific.
|
||||
USER_BASE=`%{__python3} -m site --user-base`
|
||||
LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$USER_BASE/bin/avocado %{__python3} selftests/run
|
||||
PATH=$USER_BASE/bin:$PATH LANG=en_US.UTF-8 AVOCADO_CHECK_LEVEL=0 UNITTEST_AVOCADO_CMD=$USER_BASE/bin/avocado %{__python3} selftests/run
|
||||
%endif
|
||||
|
||||
|
||||
|
|
@ -450,8 +461,10 @@ connection. Avocado must be previously installed on the remote machine.
|
|||
%files -n python3-%{pkgname}-plugins-runner-remote
|
||||
%{python3_sitelib}/avocado_runner_remote/
|
||||
%{python3_sitelib}/avocado_framework_plugin_runner_remote-%{version}-py%{python3_version}.egg-info
|
||||
%endif # with_python3_fabric
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_python3_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
|
||||
|
||||
%if %{with_fabric}
|
||||
|
|
@ -471,8 +484,10 @@ itself. Avocado must be previously installed on the VM.
|
|||
%files -n python3-%{pkgname}-plugins-runner-vm
|
||||
%{python3_sitelib}/avocado_runner_vm/
|
||||
%{python3_sitelib}/avocado_framework_plugin_runner_vm-%{version}-py%{python3_version}.egg-info
|
||||
%endif # with_python3_fabric
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_python3_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
|
||||
|
||||
%if %{with_fabric}
|
||||
|
|
@ -492,8 +507,10 @@ be previously installed on the container.
|
|||
%files -n python3-%{pkgname}-plugins-runner-docker
|
||||
%{python3_sitelib}/avocado_runner_docker/
|
||||
%{python3_sitelib}/avocado_framework_plugin_runner_docker-%{version}-py%{python3_version}.egg-info
|
||||
%endif # with_python3_fabric
|
||||
%endif # with_fabric
|
||||
%endif
|
||||
# with_python3_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
|
||||
|
||||
%if %{with_resultsdb}
|
||||
|
|
@ -511,7 +528,8 @@ server.
|
|||
%{python3_sitelib}/avocado_resultsdb/
|
||||
%{python3_sitelib}/avocado_framework_plugin_resultsdb-%{version}-py%{python3_version}.egg-info
|
||||
%config(noreplace) %{_sysconfdir}/avocado/conf.d/resultsdb.conf
|
||||
%endif # with_resultsdb
|
||||
%endif
|
||||
# with_resultsdb
|
||||
|
||||
|
||||
%package -n python3-%{pkgname}-plugins-varianter-yaml-to-mux
|
||||
|
|
@ -658,6 +676,13 @@ Again Shell code (and possibly other similar shells).
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue May 12 2020 Cleber Rosa <cleber@redhat.com> - 79.0-1
|
||||
- Sync with upstream release 79.0.
|
||||
- Added Python's user base bin dir to the PATH environment variable
|
||||
while running tests, so that avocado-runner-* scripts can be found
|
||||
- Moved comment to new lines closing the conditionals, to avoid
|
||||
errors from rpmlint and rpmbuild
|
||||
|
||||
* Wed Apr 15 2020 Merlin Mathesius <mmathesi@redhat.com> - 78.0-1
|
||||
- Sync with upstream release 78.0.
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (avocado-78.0.tar.gz) = 13133bbefe7290ac174f5cf2b639e1292c1cd1deda8423bc34ce35a4590c406446c021610a207d882cb4be15da8ebb3aceaef8c6de1651ed3b675ea232def541
|
||||
SHA512 (avocado-79.0.tar.gz) = e3451af3fbb69eae8b47cd88ff1a70331f00c4f12f281afcdac28f2effc7b488b53de39c8bf8255ead97d20465e59a64f35adb0438e817654940f24be32f009e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue