Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package microos-tools for openSUSE:Factory
checked in at 2025-05-07 19:14:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/microos-tools (Old)
and /work/SRC/openSUSE:Factory/.microos-tools.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "microos-tools"
Wed May 7 19:14:52 2025 rev:44 rq:1274871 version:4.0+git14
Changes:
--------
--- /work/SRC/openSUSE:Factory/microos-tools/microos-tools.changes
2025-03-28 09:35:50.729185603 +0100
+++ /work/SRC/openSUSE:Factory/.microos-tools.new.30101/microos-tools.changes
2025-05-07 19:15:25.768611080 +0200
@@ -1,0 +2,8 @@
+Tue May 06 11:01:01 UTC 2025 - Fabian Vogt <fv...@suse.com>
+
+- Update to version 4.0+git14:
+ * test: Test with Minimal-VM as well
+ * test: Add some missing SYSTEMD_IGNORE_CHROOT=1 to poweroff calls
+ * selinux-autorelabel: Fix check for relabelling only specific filesystems
+
+-------------------------------------------------------------------
Old:
----
microos-tools-4.0+git11.obscpio
New:
----
microos-tools-4.0+git14.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ microos-tools.spec ++++++
--- /var/tmp/diff_new_pack.tQdHZ8/_old 2025-05-07 19:15:26.464640114 +0200
+++ /var/tmp/diff_new_pack.tQdHZ8/_new 2025-05-07 19:15:26.464640114 +0200
@@ -19,7 +19,7 @@
%{!?_distconfdir: %global _distconfdir %{_prefix}%{_sysconfdir}}
Name: microos-tools
-Version: 4.0+git11
+Version: 4.0+git14
Release: 0
Summary: Files and Scripts for openSUSE MicroOS
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.tQdHZ8/_old 2025-05-07 19:15:26.504641783 +0200
+++ /var/tmp/diff_new_pack.tQdHZ8/_new 2025-05-07 19:15:26.504641783 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/microos-tools.git</param>
- <param
name="changesrevision">5b85e7c157fff153da97a36d6171110efbb4cadf</param></service>
+ <param
name="changesrevision">fcbbce592bc31df00cbe63405e7f1aeec1a0758a</param></service>
</servicedata>
(No newline at EOF)
++++++ microos-tools-4.0+git11.obscpio -> microos-tools-4.0+git14.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/microos-tools-4.0+git11/selinux/selinux-autorelabel-generator
new/microos-tools-4.0+git14/selinux/selinux-autorelabel-generator
--- old/microos-tools-4.0+git11/selinux/selinux-autorelabel-generator
2025-03-25 15:25:32.000000000 +0100
+++ new/microos-tools-4.0+git14/selinux/selinux-autorelabel-generator
2025-05-06 12:59:05.000000000 +0200
@@ -21,7 +21,7 @@
# Skip non-fs (swap) mounts, /, /var, /etc (already done in the
initrd) and mountpoints with noauto
if [ "${realdir:0:1}" != "/" ] \
|| [ "${realdir}" = "/" ] || [ "${realdir}" = "/var" ] || [
"${realdir}" = "/etc" ] \
- || ! findmnt --fstab --noheadings --output FSTYPE --target /
| grep -qE '^(ext2|ext3|ext4|xfs|btrfs|jfs)$' \
+ || ! findmnt --fstab --noheadings --output FSTYPE --target
"${realdir}" | grep -qE '^(ext2|ext3|ext4|xfs|btrfs|jfs)$' \
|| findmnt --fstab --noheadings --output OPTIONS --target
"${realdir}" | grep -qwE 'noauto|x-systemd\.automount|_netdev'; then
continue
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git11/test/test.sh
new/microos-tools-4.0+git14/test/test.sh
--- old/microos-tools-4.0+git11/test/test.sh 2025-03-25 15:25:32.000000000
+0100
+++ new/microos-tools-4.0+git14/test/test.sh 2025-05-06 12:59:05.000000000
+0200
@@ -59,7 +59,7 @@
#!/bin/bash
set -euxo pipefail
exec &>/dev/ttyS0
-trap '[ $? -eq 0 ] || poweroff -f' EXIT
+trap '[ $? -eq 0 ] || SYSTEMD_IGNORE_CHROOT=1 poweroff -f' EXIT
mount -t 9p -o trans=virtio tmpdir /mnt
cp -av /mnt/install/usr /
cp /usr/lib/modules/$(uname -r)/vmlinuz /mnt/vmlinuz
@@ -94,3 +94,53 @@
echo "Test failed"
exit 1
fi
+
+# Now do some testing with Minimal-VM instead of MicroOS
+
+# Download latest Minimal-VM image
+if ! [ -f openSUSE-Tumbleweed-Minimal-VM.x86_64-kvm-and-xen.qcow2 ]; then
+ wget --progress=bar:force:noscroll
https://download.opensuse.org/tumbleweed/appliances/openSUSE-Tumbleweed-Minimal-VM.x86_64-kvm-and-xen.qcow2
+ qemu-img snapshot -c initial
openSUSE-Tumbleweed-Minimal-VM.x86_64-kvm-and-xen.qcow2
+else
+ qemu-img snapshot -a initial
openSUSE-Tumbleweed-Minimal-VM.x86_64-kvm-and-xen.qcow2
+fi
+
+# Use combustion in the downloaded image to generate an initrd with the new
98selinux-microos.
+if ! [ -n "${reuseinitrd}" ] || ! [ -e "${tmpdir}/vmlinuz-minimal" ] || ! [ -e
"${tmpdir}/initrd-minimal" ]; then
+ rm -f "${tmpdir}/done"
+ cat >create-initrd <<'EOF'
+#!/bin/bash
+set -euxo pipefail
+exec &>/dev/ttyS0
+trap '[ $? -eq 0 ] || SYSTEMD_IGNORE_CHROOT=1 poweroff -f' EXIT
+mount -t 9p -o trans=virtio tmpdir /mnt
+cp -av /mnt/install/usr /
+cp /usr/lib/modules/$(uname -r)/vmlinuz /mnt/vmlinuz-minimal
+dracut -f --no-hostonly /mnt/initrd-minimal
+touch /mnt/done
+umount /mnt
+SYSTEMD_IGNORE_CHROOT=1 poweroff -f
+EOF
+
+ timeout 300 qemu-system-x86_64 "${QEMU_BASEARGS[@]}" -drive
if=virtio,file=openSUSE-Tumbleweed-Minimal-VM.x86_64-kvm-and-xen.qcow2 \
+ -fw_cfg
name=opt/org.opensuse.combustion/script,file=create-initrd
+
+ if ! [ -e "${tmpdir}/done" ]; then
+ echo "Initrd generation failed"
+ exit 1
+ fi
+fi
+
+# Test using a config drive
+rm -f "${tmpdir}/done"
+qemu-img snapshot -a initial
openSUSE-Tumbleweed-Minimal-VM.x86_64-kvm-and-xen.qcow2
+
+timeout 300 qemu-system-x86_64 "${QEMU_BASEARGS[@]}" -drive
if=virtio,file=openSUSE-Tumbleweed-Minimal-VM.x86_64-kvm-and-xen.qcow2 \
+ -kernel vmlinuz-minimal -initrd initrd-minimal -append "root=LABEL=ROOT
rw console=ttyS0 security=selinux selinux=1 quiet systemd.show_status=1
systemd.log_target=console systemd.journald.forward_to_console=1
rd.emergency=poweroff rd.shell=0" \
+ -drive if=virtio,file=combustion.raw
+
+if ! [ -e "${tmpdir}/done" ]; then
+ echo "Test failed"
+ exit 1
+fi
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/microos-tools-4.0+git11/test/testscript
new/microos-tools-4.0+git14/test/testscript
--- old/microos-tools-4.0+git11/test/testscript 2025-03-25 15:25:32.000000000
+0100
+++ new/microos-tools-4.0+git14/test/testscript 2025-05-06 12:59:05.000000000
+0200
@@ -2,11 +2,16 @@
set -euxo pipefail
exec &>/dev/ttyS0
# Poweroff immediately on any failure to avoid unnecessary waiting.
-trap '[ $? -eq 0 ] || poweroff -f' EXIT
+trap '[ $? -eq 0 ] || SYSTEMD_IGNORE_CHROOT=1 poweroff -f' EXIT
# Remove old microos-tools
-rpm -e --nodeps --noscripts --nodb microos-tools
+if rpm -q microos-tools >/dev/null; then
+ rpm -e --nodeps --noscripts --nodb microos-tools
+fi
+rpm -e --nodeps --noscripts --nodb selinux-autorelabel
# Install microos-tools
+# FIXME: This installs all of microos-tools on Minimal as well,
+# which is wrong but doesn't break anything ATM.
mount -t 9p -o trans=virtio tmpdir /mnt
chown -R root:root /mnt/install/usr
cp -av /mnt/install/usr /
++++++ microos-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.tQdHZ8/_old 2025-05-07 19:15:26.612646288 +0200
+++ /var/tmp/diff_new_pack.tQdHZ8/_new 2025-05-07 19:15:26.616646455 +0200
@@ -1,5 +1,5 @@
name: microos-tools
-version: 4.0+git11
-mtime: 1742912732
-commit: 5b85e7c157fff153da97a36d6171110efbb4cadf
+version: 4.0+git14
+mtime: 1746529145
+commit: fcbbce592bc31df00cbe63405e7f1aeec1a0758a
