Sync with upstream release 80.0.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
This commit is contained in:
Cleber Rosa
parent
c0e14dbafa
commit
ba99771825
3 changed files with 11 additions and 162 deletions
|
|
@ -12,10 +12,10 @@
|
|||
%global gittar %{srcname}-%{version}.tar.gz
|
||||
%else
|
||||
%if ! 0%{?commit:1}
|
||||
%global commit 232cdefdcb4e850669c18607563791a94a068309
|
||||
%global commit fbde0850d46bc1bbd2fb059a69d9d2ba9d496920
|
||||
%endif
|
||||
%if ! 0%{?commit_date:1}
|
||||
%global commit_date 20200511
|
||||
%global commit_date 20200605
|
||||
%endif
|
||||
%global shortcommit %(c=%{commit};echo ${c:0:8})
|
||||
%global gitrel .%{commit_date}git%{shortcommit}
|
||||
|
|
@ -29,22 +29,6 @@
|
|||
# enabled by default.
|
||||
%global with_tests 1
|
||||
|
||||
|
||||
# Avocado is currently incompatible with the Fabric API in Fedora 31 and later
|
||||
# https://github.com/avocado-framework/avocado/issues/3125
|
||||
%if 0%{?fedora} >= 31
|
||||
%global with_fabric 0
|
||||
%else
|
||||
%global with_fabric 1
|
||||
%endif
|
||||
|
||||
# Python 3 version of Fabric package is new starting with Fedora 29
|
||||
%if 0%{?fedora} >= 29
|
||||
%global with_python3_fabric 1
|
||||
%else
|
||||
%global with_python3_fabric 0
|
||||
%endif
|
||||
|
||||
# resultsdb is only available for Fedora
|
||||
%if 0%{?fedora}
|
||||
%global with_resultsdb 1
|
||||
|
|
@ -53,7 +37,7 @@
|
|||
%endif
|
||||
|
||||
Name: python-%{pkgname}
|
||||
Version: 79.0
|
||||
Version: 80.0
|
||||
Release: 1%{?gitrel}%{?dist}
|
||||
Summary: Framework with tools and libraries for Automated Testing
|
||||
Group: Development/Tools
|
||||
|
|
@ -68,7 +52,6 @@ BuildArch: noarch
|
|||
|
||||
BuildRequires: kmod
|
||||
BuildRequires: procps-ng
|
||||
BuildRequires: python3-aexpect
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-docutils
|
||||
BuildRequires: python3-jinja2
|
||||
|
|
@ -81,12 +64,6 @@ BuildRequires: python3-sphinx
|
|||
%if 0%{?fedora}
|
||||
BuildRequires: python3-pycdlib
|
||||
%endif
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
BuildRequires: python3-fabric3
|
||||
%endif
|
||||
%endif
|
||||
# with_fabric
|
||||
%if %{with_resultsdb}
|
||||
BuildRequires: python3-resultsdb_api
|
||||
%endif
|
||||
|
|
@ -130,30 +107,6 @@ sed -e "s/'PyYAML>=4.2b2'/'PyYAML>=3.12'/" -i optional_plugins/varianter_yaml_to
|
|||
pushd optional_plugins/html
|
||||
%py3_build
|
||||
popd
|
||||
pushd optional_plugins/runner_remote
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_build
|
||||
%endif
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/runner_vm
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_build
|
||||
%endif
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/runner_docker
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_build
|
||||
%endif
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/resultsdb
|
||||
%if %{with_resultsdb}
|
||||
%py3_build
|
||||
|
|
@ -207,30 +160,6 @@ done
|
|||
pushd optional_plugins/html
|
||||
%py3_install
|
||||
popd
|
||||
pushd optional_plugins/runner_remote
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_install
|
||||
%endif
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/runner_vm
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_install
|
||||
%endif
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/runner_docker
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%py3_install
|
||||
%endif
|
||||
%endif
|
||||
# with_fabric
|
||||
popd
|
||||
pushd optional_plugins/resultsdb
|
||||
%if %{with_resultsdb}
|
||||
%py3_install
|
||||
|
|
@ -293,21 +222,6 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
|
|||
pushd optional_plugins/html
|
||||
%{__python3} setup.py develop --user
|
||||
popd
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
pushd optional_plugins/runner_remote
|
||||
%{__python3} setup.py develop --user
|
||||
popd
|
||||
pushd optional_plugins/runner_vm
|
||||
%{__python3} setup.py develop --user
|
||||
popd
|
||||
pushd optional_plugins/runner_docker
|
||||
%{__python3} setup.py develop --user
|
||||
popd
|
||||
%endif
|
||||
# with_python3_fabric
|
||||
%endif
|
||||
# with_fabric
|
||||
%if %{with_resultsdb}
|
||||
pushd optional_plugins/resultsdb
|
||||
%{__python3} setup.py develop --user
|
||||
|
|
@ -340,12 +254,8 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
|
|||
# AVOCADO_CHECK_LEVEL: 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
|
||||
# UNITTEST_AVOCADO_CMD: the "avocado" command to be run during
|
||||
# unittests needs to be a Python specific one on Fedora >= 28. Let's
|
||||
# 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`
|
||||
PATH=$USER_BASE/bin:$PATH 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 %{__python3} selftests/run
|
||||
%endif
|
||||
|
||||
|
||||
|
|
@ -446,73 +356,6 @@ arbitrary filesystem location.
|
|||
%{python3_sitelib}/avocado_framework_plugin_result_html-%{version}-py%{python3_version}.egg-info
|
||||
|
||||
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%package -n python3-%{pkgname}-plugins-runner-remote
|
||||
Summary: Avocado Runner for Remote Execution
|
||||
%{?python_provide:%python_provide python3-%{pkgname}-plugins-runner-remote}
|
||||
Requires: python3-%{pkgname} == %{version}-%{release}
|
||||
Requires: python3-fabric3
|
||||
|
||||
%description -n python3-%{pkgname}-plugins-runner-remote
|
||||
Allows Avocado to run jobs on a remote machine, by means of an SSH
|
||||
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
|
||||
|
||||
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%package -n python3-%{pkgname}-plugins-runner-vm
|
||||
Summary: Avocado Runner for libvirt VM Execution
|
||||
%{?python_provide:%python_provide python3-%{pkgname}-plugins-runner-vm}
|
||||
Requires: python3-%{pkgname} == %{version}-%{release}
|
||||
Requires: python3-%{pkgname}-plugins-runner-remote == %{version}-%{release}
|
||||
Requires: python3-libvirt
|
||||
|
||||
%description -n python3-%{pkgname}-plugins-runner-vm
|
||||
Allows Avocado to run jobs on a libvirt based VM, by means of
|
||||
interaction with a libvirt daemon and an SSH connection to the VM
|
||||
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
|
||||
|
||||
|
||||
%if %{with_fabric}
|
||||
%if %{with_python3_fabric}
|
||||
%package -n python3-%{pkgname}-plugins-runner-docker
|
||||
Summary: Avocado Runner for Execution on Docker Containers
|
||||
%{?python_provide:%python_provide python3-%{pkgname}-plugins-runner-docker}
|
||||
Requires: python3-%{pkgname} == %{version}-%{release}
|
||||
Requires: python3-%{pkgname}-plugins-runner-remote == %{version}-%{release}
|
||||
Requires: python3-aexpect
|
||||
|
||||
%description -n python3-%{pkgname}-plugins-runner-docker
|
||||
Allows Avocado to run jobs on a Docker container by interacting with a
|
||||
Docker daemon and attaching to the container itself. Avocado must
|
||||
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
|
||||
|
||||
|
||||
%if %{with_resultsdb}
|
||||
%package -n python3-%{pkgname}-plugins-resultsdb
|
||||
Summary: Avocado plugin to propagate job results to ResultsDB
|
||||
|
|
@ -676,6 +519,11 @@ Again Shell code (and possibly other similar shells).
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Jun 6 2020 Cleber Rosa <cleber@redhat.com> - 80.0-1
|
||||
- Sync with upstream release 80.0.
|
||||
- Dropped use of custom avocado command for tests
|
||||
- Do not build deprecated runners
|
||||
|
||||
* 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue