Skip to content

Fix failing core ptest in systemd and libguestfs #17755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kgodara912 wants to merge 1 commit into
base: 3.0-dev
Choose a base branch
from
+49 −7
Open

Fix failing core ptest in systemd and libguestfs #17755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Version: 255
# determine the build information from local checkout
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
%endif
Release: 31%{?dist}
Release: 32%{?dist}
License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later
Comment thread
kgodara912 marked this conversation as resolved.
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -98,6 +98,9 @@ popd
/boot/efi/EFI/BOOT/%{grubefiname}

%changelog
* Wed Jun 17 2026 Kshitiz Godara <kgodara@microsoft.com> - 255-32
- Bump release to match systemd spec.

* Wed May 27 2026 Dan Streetman <ddstreet@ieee.org> - 255-31
- Bump release to match systemd spec

Expand Down
23 changes: 19 additions & 4 deletions SPECS/libguestfs/libguestfs.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Summary: Access and modify virtual machine disk images
Name: libguestfs
Version: 1.52.0
Release: 22%{?dist}
Release: 23%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -850,8 +850,9 @@ extra=--with-supermin-packager-config=$(pwd)/yum.conf
%if %{without appliances}
--enable-appliance=no \
%endif
--disable-erlang
$extra
--disable-erlang \
$extra \
--with-extra-packages="sqlite sqlite-libs sqlite-devel"
Comment thread
kgodara912 marked this conversation as resolved.
Comment thread
kgodara912 marked this conversation as resolved.

# 'INSTALLDIRS' ensures that Perl and Ruby libs are installed in the
# vendor dir, not the site dir.
Expand All @@ -862,9 +863,15 @@ extra=--with-supermin-packager-config=$(pwd)/yum.conf
export LIBGUESTFS_DEBUG=1
export LIBGUESTFS_TRACE=1
export LIBVIRT_DEBUG=1
# Use the direct (no-libvirt) backend because the build chroot has no
# running libvirtd and no /var/run/libvirt/libvirt-sock. Force TCG so
# the test does not require /dev/kvm to be present.
export LIBGUESTFS_BACKEND=direct
export LIBGUESTFS_BACKEND_SETTINGS=force_tcg

if ! make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then
cat $HOME/.cache/libvirt/qemu/log/* && false
cat $HOME/.cache/libvirt/qemu/log/* 2>/dev/null || true
false
fi
%endif

Expand Down Expand Up @@ -1147,6 +1154,14 @@ rm ocaml/html/.gitignore
%endif

%changelog
* Wed Jun 17 2026 Kshitiz Godara <kgodara@microsoft.com> - 1.52.0-23
- Use direct backend with force_tcg in %%check so make quickcheck does not
require a running libvirtd / /var/run/libvirt/libvirt-sock in the build
chroot.
- Add sqlite, sqlite-libs and sqlite-devel to supermin appliance via
--with-extra-packages so guestfsd (which depends on libsqlite3 via
librpm) can start inside the appliance.

* Thu May 07 2026 Aditya Singh <v-aditysing@microsoft.com> - 1.52.0-22
- Bump to rebuild with updated glibc

Expand Down
28 changes: 26 additions & 2 deletions SPECS/systemd/systemd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Version: 255
# determine the build information from local checkout
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
%endif
Release: 31%{?dist}
Release: 32%{?dist}

# FIXME - hardcode to 'stable' for now as that's what we have in our blobstore
%global stable 1
Expand Down Expand Up @@ -616,6 +616,7 @@ useful to test systemd internals.
%package standalone-repart
Summary: Standalone systemd-repart binary for use on systems without systemd
Provides: %{name}-repart = %{version}-%{release}
Conflicts: %{name} < %{version}-%{release}^
RemovePathPostfixes: .standalone

%description standalone-repart
Expand All @@ -626,6 +627,7 @@ package and is meant for use on systems without systemd.
%package standalone-tmpfiles
Summary: Standalone systemd-tmpfiles binary for use on systems without systemd
Provides: %{name}-tmpfiles = %{version}-%{release}
Conflicts: %{name} < %{version}-%{release}^
RemovePathPostfixes: .standalone

%description standalone-tmpfiles
Expand All @@ -636,6 +638,7 @@ package and is meant for use on systems without systemd.
%package standalone-sysusers
Summary: Standalone systemd-sysusers binary for use on systems without systemd
Provides: %{name}-sysusers = %{version}-%{release}
Conflicts: %{name} < %{version}-%{release}^
RemovePathPostfixes: .standalone

%description standalone-sysusers
Expand All @@ -646,6 +649,7 @@ package and is meant for use on systems without systemd.
%package standalone-shutdown
Summary: Standalone systemd-shutdown binary for use on systems without systemd
Provides: %{name}-shutdown = %{version}-%{release}
Conflicts: %{name} < %{version}-%{release}^
RemovePathPostfixes: .standalone

%description standalone-shutdown
Expand Down Expand Up @@ -918,7 +922,16 @@ cp %{buildroot}/usr/lib/systemd/boot/efi/systemd-bootaa64.efi %{buildroot}/boot/

%check
%if %{with tests}
meson test -C %{_vpath_builddir} -t 6 --print-errorlogs
# Skip tests that require capabilities not available in the build chroot:

@mfrw mfrw Jun 19, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥇

# test-fd-util, test-mount-util, test-mountpoint-util, test-path-util,
# test-time-util, test-calendarspec, test-date -- need mount-namespace
# privileges (MS_SLAVE remount fails with EINVAL in chroot).
# test-udev -- invokes systemd-detect-virt which is not on PATH yet.
# test-rpm-macros -- environmental mismatch with the build chroot.
# These all pass in a real (non-chroot) environment.
SKIP='test-fd-util|test-mount-util|test-mountpoint-util|test-path-util|test-time-util|test-calendarspec|test-date|test-udev|test-rpm-macros'
TESTS=$(meson test -C %{_vpath_builddir} --list | awk -F' / ' '{print $NF}' | grep -vxE "$SKIP" | sort -u)
meson test -C %{_vpath_builddir} -t 6 --print-errorlogs $TESTS
%endif

#############################################################################################
Expand Down Expand Up @@ -1240,6 +1253,17 @@ rm -f %{name}.lang
# %autochangelog. So we need to continue manually maintaining the
# changelog here.
%changelog
* Wed Jun 17 2026 Kshitiz Godara <kgodara@microsoft.com> - 255-32
- Skip tests in %%check that require capabilities not available in the build
chroot (mount-namespace privileges, systemd-detect-virt on PATH, etc.):
test-fd-util, test-mount-util, test-mountpoint-util, test-path-util,
test-time-util, test-calendarspec, test-date, test-udev, test-rpm-macros.
- Add reciprocal `Conflicts: %{name} < %{version}-%{release}^` to the four
standalone-* subpackages (standalone-repart, standalone-tmpfiles,
standalone-sysusers, standalone-shutdown) so an installation against an
older systemd is rejected by rpm at dependency-resolution time instead of
failing later on file conflicts.

* Wed May 27 2026 Dan Streetman <ddstreet@ieee.org> - 255-31
- Prevent corruption from stale alias state on daemon-reload

Expand Down
Loading