|
|
@ -2,20 +2,10 @@
|
|
|
|
# https://build.opensuse.org/package/view_file/devel:openQA/os-autoinst/os-autoinst.spec
|
|
|
|
# https://build.opensuse.org/package/view_file/devel:openQA/os-autoinst/os-autoinst.spec
|
|
|
|
# License: GPLv2+
|
|
|
|
# License: GPLv2+
|
|
|
|
|
|
|
|
|
|
|
|
# Tests require perl-Test-Compile >= 1.1.0, currently only available
|
|
|
|
# Full stack test only runs reliably on x86
|
|
|
|
# on Fedora > 21 (and I'm guessing RHEL > 7)
|
|
|
|
|
|
|
|
%if 0%{?fedora} > 21 || 0%{?rhel} > 7
|
|
|
|
|
|
|
|
%global with_tests 1
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Full stack test only runs reliably on x86, and requires a Mojo
|
|
|
|
|
|
|
|
# component which isn't available on Fedora < 25
|
|
|
|
|
|
|
|
%ifnarch %{ix86} x86_64
|
|
|
|
%ifnarch %{ix86} x86_64
|
|
|
|
%global no_fullstack 1
|
|
|
|
%global no_fullstack 1
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
%if 0%{?fedora} < 25
|
|
|
|
|
|
|
|
%global no_fullstack 1
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# os-autoinst has a bunch of annoyingly-badly-named private modules,
|
|
|
|
# os-autoinst has a bunch of annoyingly-badly-named private modules,
|
|
|
|
# we do not want automatic provides or requires for these
|
|
|
|
# we do not want automatic provides or requires for these
|
|
|
@ -32,24 +22,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
%global github_owner os-autoinst
|
|
|
|
%global github_owner os-autoinst
|
|
|
|
%global github_name os-autoinst
|
|
|
|
%global github_name os-autoinst
|
|
|
|
%global github_version 4.4
|
|
|
|
%global github_version 4.5
|
|
|
|
%global github_commit cf2d0515497a49ec02077461e2d0a9ae6a975e45
|
|
|
|
%global github_commit 25191d50d54eaded10b6b26199bb986728dcd5c2
|
|
|
|
# if set, will be a post-release snapshot build, otherwise a 'normal' build
|
|
|
|
# if set, will be a post-release snapshot build, otherwise a 'normal' build
|
|
|
|
%global github_date 20170807
|
|
|
|
%global github_date 20171220
|
|
|
|
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
|
|
|
|
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
|
|
|
|
|
|
|
|
|
|
|
|
Name: os-autoinst
|
|
|
|
Name: os-autoinst
|
|
|
|
Version: %{github_version}
|
|
|
|
Version: %{github_version}
|
|
|
|
Release: 26%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
|
|
|
|
Release: 1%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
|
|
|
|
Summary: OS-level test automation
|
|
|
|
Summary: OS-level test automation
|
|
|
|
License: GPLv2+
|
|
|
|
License: GPLv2+
|
|
|
|
Group: Development/System
|
|
|
|
Group: Development/System
|
|
|
|
URL: https://os-autoinst.github.io/openQA/
|
|
|
|
URL: https://os-autoinst.github.io/openQA/
|
|
|
|
Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
|
|
|
|
Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
|
|
|
|
# Type the long text string a bit slower in the full stack test
|
|
|
|
|
|
|
|
# This is basically working around RHBZ #1481858, I believe; when
|
|
|
|
|
|
|
|
# that's fixed in qemu we can probably drop it
|
|
|
|
|
|
|
|
Patch0: 0001-Type-a-bit-slower-in-the-full_stack-test.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BuildRequires: autoconf
|
|
|
|
BuildRequires: autoconf
|
|
|
|
BuildRequires: automake
|
|
|
|
BuildRequires: automake
|
|
|
@ -70,13 +56,13 @@ BuildRequires: pkgconfig(fftw3)
|
|
|
|
BuildRequires: pkgconfig(sndfile)
|
|
|
|
BuildRequires: pkgconfig(sndfile)
|
|
|
|
BuildRequires: pkgconfig(theoraenc)
|
|
|
|
BuildRequires: pkgconfig(theoraenc)
|
|
|
|
BuildRequires: systemd
|
|
|
|
BuildRequires: systemd
|
|
|
|
%if 0%{?with_tests}
|
|
|
|
|
|
|
|
BuildRequires: perl(Devel::Cover)
|
|
|
|
BuildRequires: perl(Devel::Cover)
|
|
|
|
BuildRequires: perl(Pod::Coverage)
|
|
|
|
BuildRequires: perl(Pod::Coverage)
|
|
|
|
# The OO interface to Test::Compile only appeared in 1.1.0
|
|
|
|
# The OO interface to Test::Compile only appeared in 1.1.0
|
|
|
|
BuildRequires: perl(Test::Compile) >= 1.1.0
|
|
|
|
BuildRequires: perl(Test::Compile) >= 1.1.0
|
|
|
|
BuildRequires: perl(Test::Fatal)
|
|
|
|
BuildRequires: perl(Test::Fatal)
|
|
|
|
BuildRequires: perl(Test::MockModule)
|
|
|
|
BuildRequires: perl(Test::MockModule)
|
|
|
|
|
|
|
|
BuildRequires: perl(Test::Mock::Time)
|
|
|
|
BuildRequires: perl(Test::More)
|
|
|
|
BuildRequires: perl(Test::More)
|
|
|
|
BuildRequires: perl(Test::Output)
|
|
|
|
BuildRequires: perl(Test::Output)
|
|
|
|
BuildRequires: perl(Test::Pod)
|
|
|
|
BuildRequires: perl(Test::Pod)
|
|
|
@ -89,7 +75,6 @@ BuildRequires: /usr/bin/qemu-img
|
|
|
|
%else
|
|
|
|
%else
|
|
|
|
BuildRequires: perl(Mojo::File)
|
|
|
|
BuildRequires: perl(Mojo::File)
|
|
|
|
%endif # no_fullstack
|
|
|
|
%endif # no_fullstack
|
|
|
|
%endif # with_tests
|
|
|
|
|
|
|
|
Requires: /usr/bin/qemu-img
|
|
|
|
Requires: /usr/bin/qemu-img
|
|
|
|
Requires: optipng
|
|
|
|
Requires: optipng
|
|
|
|
# tinycv is a compiled public module, so we should have this
|
|
|
|
# tinycv is a compiled public module, so we should have this
|
|
|
@ -143,7 +128,7 @@ This package contains Open vSwitch support for os-autoinst.
|
|
|
|
%if 0%{?no_fullstack}
|
|
|
|
%if 0%{?no_fullstack}
|
|
|
|
rm -f t/99-full-stack.t
|
|
|
|
rm -f t/99-full-stack.t
|
|
|
|
sed -i -e 's, 99-full-stack.t,,g' t/Makefile.am
|
|
|
|
sed -i -e 's, 99-full-stack.t,,g' t/Makefile.am
|
|
|
|
%endif
|
|
|
|
%endif # no_fullstack
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
%build
|
|
|
|
mkdir -p m4
|
|
|
|
mkdir -p m4
|
|
|
@ -174,9 +159,7 @@ find %{buildroot} -depth -type d -and -not -name distri -exec rmdir {} \;
|
|
|
|
export NO_BRP_STALE_LINK_ERROR=yes
|
|
|
|
export NO_BRP_STALE_LINK_ERROR=yes
|
|
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
%check
|
|
|
|
%if 0%{?with_tests}
|
|
|
|
|
|
|
|
make check VERBOSE=1
|
|
|
|
make check VERBOSE=1
|
|
|
|
%endif # with_tests
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%post openvswitch
|
|
|
|
%post openvswitch
|
|
|
|
%systemd_post os-autoinst-openvswitch.service
|
|
|
|
%systemd_post os-autoinst-openvswitch.service
|
|
|
@ -226,6 +209,9 @@ make check VERBOSE=1
|
|
|
|
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
|
|
|
|
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
|
|
|
|
* Wed Dec 20 2017 Adam Williamson <awilliam@redhat.com> - 4.5-1.20171220git25191d5
|
|
|
|
|
|
|
|
- Bump to latest git again, bump version to 4.5 (per upstream)
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Aug 17 2017 Adam Williamson <awilliam@redhat.com> - 4.4-26.20170807gitcf2d051
|
|
|
|
* Thu Aug 17 2017 Adam Williamson <awilliam@redhat.com> - 4.4-26.20170807gitcf2d051
|
|
|
|
- Bump to latest git again (wait_screen_change enhancement looks nice)
|
|
|
|
- Bump to latest git again (wait_screen_change enhancement looks nice)
|
|
|
|
|
|
|
|
|
|
|
|