Accepting request 1031414 from home:dfaggioli:devel:Virtualization
- qtests test are not realiable when run inside OBS builders, so let's disable that part of the testsuite for now. There is work ongoing to run it somewhere else (on dedicated hosts) to avoid loosing coverage. (bsc#1204566) - Improve dependency handling (e.g., what's recommended vs. what's required. - Add a subpackage (qemu-headless) that brings in all the packages that are needed for creating VMs with tools like virt-install or VirtManager, run either locally or from a remote host. (bsc#1202166) OBS-URL: https://build.opensuse.org/request/show/1031414 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=740
This commit is contained in:
18
qemu.changes
18
qemu.changes
@@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 26 11:17:37 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
|
||||
|
||||
- qtests test are not realiable when run inside OBS builders, so
|
||||
let's disable that part of the testsuite for now. There is work
|
||||
ongoing to run it somewhere else (on dedicated hosts) to avoid
|
||||
loosing coverage. (bsc#1204566)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 24 16:28:16 UTC 2022 - Dario Faggioli <dfaggioli@suse.com>
|
||||
|
||||
- Improve dependency handling (e.g., what's recommended vs. what's
|
||||
required.
|
||||
- Add a subpackage (qemu-headless) that brings in all the packages
|
||||
that are needed for creating VMs with tools like virt-install
|
||||
or VirtManager, run either locally or from a remote host.
|
||||
(bsc#1202166)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 10 10:28:11 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net>
|
||||
|
||||
|
34
qemu.spec
34
qemu.spec
@@ -95,6 +95,8 @@
|
||||
%define with_daxctl 1
|
||||
%endif
|
||||
|
||||
%bcond_with chkqtests
|
||||
|
||||
# enforce pxe rom sizes for migration compatability from SLE 11 SP3 forward
|
||||
# the following need to be > 64K
|
||||
%define supported_nics_large {e1000 rtl8139}
|
||||
@@ -395,6 +397,7 @@ Recommends: qemu-ui-spice-app
|
||||
# End of "ifarch s390x"
|
||||
%endif
|
||||
Recommends: qemu-block-curl
|
||||
Recommends: qemu-block-nfs
|
||||
Recommends: qemu-ksm = %{qemuver}
|
||||
Recommends: qemu-tools
|
||||
Recommends: qemu-ui-curses
|
||||
@@ -405,7 +408,6 @@ Suggests: qemu-accel-qtest
|
||||
Suggests: qemu-block-dmg
|
||||
Suggests: qemu-block-gluster
|
||||
Suggests: qemu-block-iscsi
|
||||
Suggests: qemu-block-nfs
|
||||
Suggests: qemu-block-ssh
|
||||
Suggests: qemu-chardev-baum
|
||||
Suggests: qemu-extra
|
||||
@@ -420,6 +422,27 @@ Obsoletes: qemu-ui-sdl < %{qemuver}
|
||||
# There isn't any for qemu-linux-user.
|
||||
%endif
|
||||
|
||||
%package headless
|
||||
Summary: Minimum set of packages for having a functional QEMU
|
||||
Group: System/Emulators/PC
|
||||
Version: %{qemuver}
|
||||
Release: 0
|
||||
Requires: qemu
|
||||
Requires: qemu-tools
|
||||
%if %{legacy_qemu_kvm}
|
||||
Requires: qemu-kvm
|
||||
%endif
|
||||
Requires: qemu-hw-usb-redirect
|
||||
# qemu-ui-spice-core will bring in qemu-audio-spice qemu-ui-opengl too
|
||||
Requires: qemu-ui-spice-core
|
||||
Requires: qemu-chardev-spice
|
||||
|
||||
%description headless
|
||||
%{generic_qemu_description}
|
||||
|
||||
This meta-package brings in, as dependencies, the minimum set of packages
|
||||
currently necessary for having a functional (headless) QEMU/KVM stack.
|
||||
|
||||
%if "%{name}" == "qemu-linux-user"
|
||||
# Description and files for the qemu-linux-user package
|
||||
|
||||
@@ -564,12 +587,12 @@ Release: 0
|
||||
Requires: %name = %{qemuver}
|
||||
Requires: qemu-accel-tcg-x86
|
||||
Requires: qemu-ipxe
|
||||
Requires: qemu-ovmf-x86_64
|
||||
Requires: qemu-seabios
|
||||
Requires: qemu-sgabios
|
||||
Requires: qemu-vgabios
|
||||
Recommends: ovmf
|
||||
Recommends: qemu-microvm
|
||||
Recommends: qemu-ovmf-x86_64
|
||||
|
||||
%description x86
|
||||
%{generic_qemu_description}
|
||||
@@ -2275,10 +2298,9 @@ echo 'int main (void) { return 0; }' > %{srcdir}/tests/unit/test-seccomp.c
|
||||
# This would be `make_build check-block`. But iotests are not reliable
|
||||
# if ran in parallel in OBS, so let's be slow for now.
|
||||
make -O V=1 VERBOSE=1 -j1 check-block
|
||||
# Run qtests in parallel. If it becomes unreliable, we can try something
|
||||
# like this: make -O V=1 VERBOSE=1 -j1 check-qtest
|
||||
%if !0%{?qemu_user_space_build}
|
||||
%make_build check-qtest
|
||||
%if %{with chkqtests} && !0%{?qemu_user_space_build}
|
||||
# Run qtests sequentially, as it's too unreliable, when run in OBS, if parallelized
|
||||
make -O V=1 VERBOSE=1 -j1 check-qtest
|
||||
%endif
|
||||
# Last step will be to run a full check-report, but we will
|
||||
# enable this at a later point
|
||||
|
34
qemu.spec.in
34
qemu.spec.in
@@ -98,6 +98,8 @@
|
||||
%define with_daxctl 1
|
||||
%endif
|
||||
|
||||
%bcond_with chkqtests
|
||||
|
||||
# enforce pxe rom sizes for migration compatability from SLE 11 SP3 forward
|
||||
# the following need to be > 64K
|
||||
%define supported_nics_large {e1000 rtl8139}
|
||||
@@ -337,6 +339,7 @@ Recommends: qemu-ui-spice-app
|
||||
# End of "ifarch s390x"
|
||||
%endif
|
||||
Recommends: qemu-block-curl
|
||||
Recommends: qemu-block-nfs
|
||||
Recommends: qemu-ksm = %{qemuver}
|
||||
Recommends: qemu-tools
|
||||
Recommends: qemu-ui-curses
|
||||
@@ -347,7 +350,6 @@ Suggests: qemu-accel-qtest
|
||||
Suggests: qemu-block-dmg
|
||||
Suggests: qemu-block-gluster
|
||||
Suggests: qemu-block-iscsi
|
||||
Suggests: qemu-block-nfs
|
||||
Suggests: qemu-block-ssh
|
||||
Suggests: qemu-chardev-baum
|
||||
Suggests: qemu-extra
|
||||
@@ -362,6 +364,27 @@ Obsoletes: qemu-ui-sdl < %{qemuver}
|
||||
# There isn't any for qemu-linux-user.
|
||||
%endif
|
||||
|
||||
%package headless
|
||||
Summary: Minimum set of packages for having a functional QEMU
|
||||
Group: System/Emulators/PC
|
||||
Version: %{qemuver}
|
||||
Release: 0
|
||||
Requires: qemu
|
||||
Requires: qemu-tools
|
||||
%if %{legacy_qemu_kvm}
|
||||
Requires: qemu-kvm
|
||||
%endif
|
||||
Requires: qemu-hw-usb-redirect
|
||||
# qemu-ui-spice-core will bring in qemu-audio-spice qemu-ui-opengl too
|
||||
Requires: qemu-ui-spice-core
|
||||
Requires: qemu-chardev-spice
|
||||
|
||||
%description headless
|
||||
%{generic_qemu_description}
|
||||
|
||||
This meta-package brings in, as dependencies, the minimum set of packages
|
||||
currently necessary for having a functional (headless) QEMU/KVM stack.
|
||||
|
||||
%if "%{name}" == "qemu-linux-user"
|
||||
# Description and files for the qemu-linux-user package
|
||||
|
||||
@@ -506,12 +529,12 @@ Release: 0
|
||||
Requires: %name = %{qemuver}
|
||||
Requires: qemu-accel-tcg-x86
|
||||
Requires: qemu-ipxe
|
||||
Requires: qemu-ovmf-x86_64
|
||||
Requires: qemu-seabios
|
||||
Requires: qemu-sgabios
|
||||
Requires: qemu-vgabios
|
||||
Recommends: ovmf
|
||||
Recommends: qemu-microvm
|
||||
Recommends: qemu-ovmf-x86_64
|
||||
|
||||
%description x86
|
||||
%{generic_qemu_description}
|
||||
@@ -2217,10 +2240,9 @@ echo 'int main (void) { return 0; }' > %{srcdir}/tests/unit/test-seccomp.c
|
||||
# This would be `make_build check-block`. But iotests are not reliable
|
||||
# if ran in parallel in OBS, so let's be slow for now.
|
||||
make -O V=1 VERBOSE=1 -j1 check-block
|
||||
# Run qtests in parallel. If it becomes unreliable, we can try something
|
||||
# like this: make -O V=1 VERBOSE=1 -j1 check-qtest
|
||||
%if !0%{?qemu_user_space_build}
|
||||
%make_build check-qtest
|
||||
%if %{with chkqtests} && !0%{?qemu_user_space_build}
|
||||
# Run qtests sequentially, as it's too unreliable, when run in OBS, if parallelized
|
||||
make -O V=1 VERBOSE=1 -j1 check-qtest
|
||||
%endif
|
||||
# Last step will be to run a full check-report, but we will
|
||||
# enable this at a later point
|
||||
|
Reference in New Issue
Block a user