Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package combustion for openSUSE:Factory checked in at 2026-10-16 20:06:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/combustion (Old) and /work/SRC/openSUSE:Factory/.combustion.new.3698736 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "combustion" Fri Oct 16 20:06:57 2026 rev:39 rq:1385026 version:1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/combustion/combustion.changes 2026-01-17 21:42:01.028120723 +0100 +++ /work/SRC/openSUSE:Factory/.combustion.new.3698736/combustion.changes 2026-10-16 20:07:11.030861132 +0200 @@ -1,0 +2,12 @@ +Thu Oct 15 13:43:10 UTC 2026 - Fabian Vogt <[email protected]> + +- Update to version 1.6: + * Write /etc/.combustion-result.json on completion + * CI: Validate that combustion created a snapshot + * Implement support for separate /etc snapshots + * CI: Enable SELinux + * CI: Deduplicate common kernel args + * CI: Replace remaining spaces with tabs + * CI: Use GH actions/checkout@v7 + +------------------------------------------------------------------- Old: ---- combustion-1.5+git8.obscpio New: ---- combustion-1.6.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ combustion.spec ++++++ --- /var/tmp/diff_new_pack.CFs4HP/_old 2026-10-16 20:07:12.484921890 +0200 +++ /var/tmp/diff_new_pack.CFs4HP/_new 2026-10-16 20:07:12.487922015 +0200 @@ -17,7 +17,7 @@ Name: combustion -Version: 1.5+git8 +Version: 1.6 Release: 0 Summary: System for initial configuration of appliances License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.CFs4HP/_old 2026-10-16 20:07:12.632928075 +0200 +++ /var/tmp/diff_new_pack.CFs4HP/_new 2026-10-16 20:07:12.648928743 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/combustion.git</param> - <param name="changesrevision">c60eaacde224b30fac69bbf4c81b526a33281445</param></service></servicedata> + <param name="changesrevision">f4bcb801479b1b6d74823457940e2d2a68f7b87c</param></service></servicedata> (No newline at EOF) ++++++ combustion-1.5+git8.obscpio -> combustion-1.6.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/combustion-1.5+git8/.github/workflows/test.yml new/combustion-1.6/.github/workflows/test.yml --- old/combustion-1.5+git8/.github/workflows/test.yml 2026-01-16 15:03:26.000000000 +0100 +++ new/combustion-1.6/.github/workflows/test.yml 2026-10-15 14:09:48.000000000 +0200 @@ -8,7 +8,7 @@ build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - name: Install dependencies run: | sudo apt update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/combustion-1.5+git8/combustion new/combustion-1.6/combustion --- old/combustion-1.5+git8/combustion 2026-01-16 15:03:26.000000000 +0100 +++ new/combustion-1.6/combustion 2026-10-15 14:09:48.000000000 +0200 @@ -329,11 +329,19 @@ echo "Command failed" exit 1 fi - chroot /sysroot snapper --no-dbus create -d "After combustion configuration" --userdata "important=yes" || : + # Attempt to snapshot /etc if there's a separate config + if [ -e /etc/snapper/configs/etc ]; then + chroot /sysroot snapper --no-dbus -c etc create -d "After combustion configuration" --userdata "important=yes" || : + fi + # Only attempt to snapshot /sysroot if it can be written to + if [ -w /sysroot ]; then + chroot /sysroot snapper --no-dbus create -d "After combustion configuration" --userdata "important=yes" || : + fi fi if [ "${complete}" -eq 1 ]; then rm -f /sysroot/var/lib/YaST2/reconfig_system + echo '{}' > /sysroot/etc/.combustion-result.json fi exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/combustion-1.5+git8/test/test.sh new/combustion-1.6/test/test.sh --- old/combustion-1.5+git8/test/test.sh 2026-01-16 15:03:26.000000000 +0100 +++ new/combustion-1.6/test/test.sh 2026-10-15 14:09:48.000000000 +0200 @@ -34,6 +34,16 @@ -chardev null,id=serial,logfile=/dev/stdout,logappend=on -serial chardev:serial -monitor none -virtfs "local,path=${tmpdir},mount_tag=tmpdir,security_model=none") +KERNEL_BASEARGS=( + root=LABEL=ROOT + console=ttyS0 + # In TW, SELinux needs to be enabled explicitly + security=selinux selinux=1 + # Configure output and logging logging + quiet systemd.show_status=1 systemd.log_target=console systemd.journald.forward_to_console=1 + # Make sure to fail fast + rd.emergency=poweroff rd.shell=0) + # Prepare the temporary dir: Install combustion and copy resources. testdir="$(dirname "$0")" make -C "${testdir}/.." install "DESTDIR=${tmpdir}/install" @@ -96,7 +106,7 @@ /sbin/mkfs.ext4 -F -d configdrv -L ignition combustion.raw 16M timeout 300 qemu-system-x86_64 "${QEMU_BASEARGS[@]}" -drive if=virtio,file=openSUSE-MicroOS.x86_64-kvm-and-xen.qcow2 \ - -kernel vmlinuz -initrd initrd -append "root=LABEL=ROOT console=ttyS0 quiet systemd.show_status=1 systemd.log_target=console systemd.journald.forward_to_console=1 rd.emergency=poweroff rd.shell=0" \ + -kernel vmlinuz -initrd initrd -append "${KERNEL_BASEARGS[*]}" \ -drive if=virtio,file=combustion.raw if ! [ -e "${tmpdir}/done" ]; then @@ -109,7 +119,7 @@ qemu-img snapshot -a initial openSUSE-MicroOS.x86_64-kvm-and-xen.qcow2 timeout 300 qemu-system-x86_64 "${QEMU_BASEARGS[@]}" -drive if=virtio,file=openSUSE-MicroOS.x86_64-kvm-and-xen.qcow2 \ - -kernel vmlinuz -initrd initrd -append "root=LABEL=ROOT console=ttyS0 quiet systemd.show_status=1 systemd.log_target=console systemd.journald.forward_to_console=1 rd.emergency=poweroff rd.shell=0" \ + -kernel vmlinuz -initrd initrd -append "${KERNEL_BASEARGS[*]}" \ -fw_cfg name=opt/org.opensuse.combustion/script,file=testscript if ! [ -e "${tmpdir}/done" ]; then @@ -121,12 +131,12 @@ rm -f "${tmpdir}/done" timeout 300 qemu-system-x86_64 "${QEMU_BASEARGS[@]}" -drive if=virtio,file=openSUSE-MicroOS.x86_64-kvm-and-xen.qcow2 \ - -kernel vmlinuz -initrd initrd -append "root=LABEL=ROOT console=ttyS0 quiet systemd.show_status=1 systemd.log_target=console systemd.journald.forward_to_console=1 rd.emergency=poweroff rd.shell=0" \ - -fw_cfg name=opt/org.opensuse.combustion/script,file=combustion-secondboot + -kernel vmlinuz -initrd initrd -append "${KERNEL_BASEARGS[*]}" \ + -fw_cfg name=opt/org.opensuse.combustion/script,file=combustion-secondboot if ! [ -e "${tmpdir}/done" ]; then - echo "Test failed" - exit 1 + echo "Test failed" + exit 1 fi # Test combustion.url using QEMU's builtin tftp server @@ -134,7 +144,7 @@ qemu-img snapshot -a initial openSUSE-MicroOS.x86_64-kvm-and-xen.qcow2 timeout 300 qemu-system-x86_64 "${QEMU_BASEARGS[@]}" -drive if=virtio,file=openSUSE-MicroOS.x86_64-kvm-and-xen.qcow2 \ - -kernel vmlinuz -initrd initrd -append "root=LABEL=ROOT console=ttyS0 quiet systemd.show_status=1 systemd.log_target=console systemd.journald.forward_to_console=1 rd.emergency=poweroff rd.shell=0 combustion.url=tftp://10.0.2.2/testscript"; \ + -kernel vmlinuz -initrd initrd -append "${KERNEL_BASEARGS[*]} combustion.url=tftp://10.0.2.2/testscript"; \ -nic "user,tftp=$tmpdir" if ! [ -e "${tmpdir}/done" ]; then @@ -147,7 +157,7 @@ qemu-img snapshot -a initial openSUSE-MicroOS.x86_64-kvm-and-xen.qcow2 timeout 300 qemu-system-x86_64 "${QEMU_BASEARGS[@]}" -drive if=virtio,file=openSUSE-MicroOS.x86_64-kvm-and-xen.qcow2 \ - -kernel vmlinuz -initrd initrd-noignition -append "root=LABEL=ROOT console=ttyS0 quiet systemd.show_status=1 systemd.log_target=console systemd.journald.forward_to_console=1 rd.emergency=poweroff rd.shell=0 combustion.url=tftp://10.0.2.2/testscript"; \ + -kernel vmlinuz -initrd initrd-noignition -append "${KERNEL_BASEARGS[*]} combustion.url=tftp://10.0.2.2/testscript"; \ -nic "user,tftp=$tmpdir" if ! [ -e "${tmpdir}/done" ]; then @@ -159,10 +169,10 @@ # 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 + 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 + 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 combustion. @@ -199,7 +209,7 @@ 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 quiet systemd.show_status=1 systemd.log_target=console systemd.journald.forward_to_console=1 rd.emergency=poweroff rd.shell=0 combustion.url=tftp://10.0.2.2/testscript"; \ + -kernel vmlinuz-minimal -initrd initrd-minimal -append "${KERNEL_BASEARGS[*]} rw combustion.url=tftp://10.0.2.2/testscript"; \ -nic "user,tftp=$tmpdir" if ! [ -e "${tmpdir}/done" ]; then @@ -211,11 +221,11 @@ rm -f "${tmpdir}/done" 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 quiet systemd.show_status=1 systemd.log_target=console systemd.journald.forward_to_console=1 rd.emergency=poweroff rd.shell=0 combustion.url=tftp://10.0.2.2/combustion-secondboot"; \ + -kernel vmlinuz-minimal -initrd initrd-minimal -append "${KERNEL_BASEARGS[*]} rw combustion.url=tftp://10.0.2.2/combustion-secondboot"; \ -nic "user,tftp=$tmpdir" if ! [ -e "${tmpdir}/done" ]; then - echo "Test failed" - exit 1 + echo "Test failed" + exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/combustion-1.5+git8/test/testscript new/combustion-1.6/test/testscript --- old/combustion-1.5+git8/test/testscript 2026-01-16 15:03:26.000000000 +0100 +++ new/combustion-1.6/test/testscript 2026-10-15 14:09:48.000000000 +0200 @@ -30,6 +30,9 @@ if journalctl --no-pager | grep "/sysroot still mounted somewhere"; then exit 1 fi +if [ -w / ]; then + snapper --csvout list --disable-used-space | grep "After combustion configuration" +fi mount -t 9p -o trans=virtio tmpdir /mnt touch /mnt/done umount /mnt ++++++ combustion.obsinfo ++++++ --- /var/tmp/diff_new_pack.CFs4HP/_old 2026-10-16 20:07:12.948941279 +0200 +++ /var/tmp/diff_new_pack.CFs4HP/_new 2026-10-16 20:07:12.955941572 +0200 @@ -1,5 +1,5 @@ name: combustion -version: 1.5+git8 -mtime: 1768572206 -commit: c60eaacde224b30fac69bbf4c81b526a33281445 +version: 1.6 +mtime: 1792066188 +commit: f4bcb801479b1b6d74823457940e2d2a68f7b87c
