Control: reopen -1
Control: retitle -1 unblock: debvm/0.4.4
On Mon, Jun 02, 2025 at 05:27:02PM +0000, Debian Bug Tracking System wrote:
> Unblocked debvm.
Michael asked me to further reduce test concurrency as he identified the
issue as not reproducible without SMP.
On Sun, 1 Jun 2025 18:37:50 +0200, Helmut Grohne wrote:
> Please unblock package debvm
>
> [ Reason ]
>
> Luca Boccassi identified that debvm was installing a wrong dependency.
> With the systemd that just migrated, debefivm-create would always fail.
> This is the main reason for migrating.
>
> Another significant change is reducing the maximum concurrency of the
> autopkgtests. Doing so reduces the chance of triggering qemu crashes.
With forcing -smp 1 in tests. We expect that the tests no longer are
flaky.
> Last but not least, a few spelling mistakes are fixed.
>
> Whilst debvm is a non-key package with autopkgtests, it is blacklisted
> on riscv64 and therefore cannot automatically migrate with 20 day delay.
>
> [ Impact ]
>
> debefivm-create will not work at all. Whilst the error is on the debvm
> side, I question whether deep freeze is a good time to restructure the
> systemd packages.
>
> [ Tests ]
>
> The relevant autopkgtest fails since the relevant systemd upload and is
> fixed in 0.4.3.
>
> [ Risks ]
>
> I honestly see little risk here. I've been wrong before though.
>
> [ Checklist ]
> [x] all changes are documented in the d/changelog
> [x] I reviewed all changes and I approve them
> [x] attach debdiff against the package in testing
>
> [ Other info ]
>
> unblock debvm/0.4.3
unblock debvm/0.4.4
Updated debdiff attached. Only difference to previous debdiff is
reducing maximum test concurrency from 4 to 1.
Helmut
diff --git a/bin/debefivm-create b/bin/debefivm-create
index d533f56..1c03be5 100755
--- a/bin/debefivm-create
+++ b/bin/debefivm-create
@@ -79,7 +79,7 @@ The root password is deleted such that a login does not ask
for it and the syste
skips installing a linux kernel image.
This can be useful to install a kernel without a package.
-If a kernel is installed via B<mmdebstrap> option C<--include>, automtatic
kernel installation is automatically skipped.
+If a kernel is installed via B<mmdebstrap> option C<--include>, automatic
kernel installation is automatically skipped.
=item B<packagelists>
@@ -176,7 +176,7 @@ die() {
exit 1
}
usage() {
- die "usage: $0 [-a architecture] [-h hostname] [-k sskey] [-o output]
[-r release] [-s task] [-z imagesize] [-- mmdebstrap options]"
+ die "usage: $0 [-a architecture] [-h hostname] [-k sshkey] [-o output]
[-r release] [-s task] [-z imagesize] [-- mmdebstrap options]"
}
usage_error() {
echo "error: $*" 1>&2
@@ -348,6 +348,7 @@ fi
set -- \
"--customize-hook=printf 'LABEL=%s / ext4 defaults 0 0' '$ROOTLABEL'
>"'"$1/etc/fstab"' \
"--include=?narrow(?exact-name(systemd-boot),?architecture(${DEBARCH%%,*}))" \
+
"--include=?narrow(?exact-name(systemd-boot-efi),?architecture(${DEBARCH%%,*}))"
\
'--include=systemd-sysv' \
"$SUITE" \
/dev/null \
diff --git a/bin/debvm-create b/bin/debvm-create
index 78e86bf..4f652e3 100755
--- a/bin/debvm-create
+++ b/bin/debvm-create
@@ -94,7 +94,7 @@ This is equivalent to specifying B<--initsystem=none>.
skips installing a linux kernel image.
This can be useful to install a kernel without a package.
-If a kernel is installed via B<mmdebstrap> option C<--include>, automtatic
kernel installation is automatically skipped.
+If a kernel is installed via B<mmdebstrap> option C<--include>, automatic
kernel installation is automatically skipped.
=item B<packagelists>
diff --git a/debian/changelog b/debian/changelog
index 8d06911..f15c665 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+debvm (0.4.4) unstable; urgency=medium
+
+ * Force tests to not use smp (Closes: #1106397)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 04 Jun 2025 10:20:14 +0200
+
+debvm (0.4.3) unstable; urgency=medium
+
+ [ Luca Boccassi ]
+ * debefivm-create: pull in systemd-boot-efi for stub binary (Closes:
#1106847)
+
+ [ Helmut Grohne ]
+ * Fix a spelling mistake in manual pages
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 31 May 2025 21:19:01 +0200
+
+debvm (0.4.2) unstable; urgency=medium
+
+ [ Colin Watson ]
+ * debefivm-create: fix typo in usage message
+
+ [ Helmut Grohne ]
+ * Attempt to improve test reliability by limiting concurrency
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 26 May 2025 22:14:07 +0200
+
debvm (0.4.1) unstable; urgency=medium
* *-create: Fix network during mmdebstrap for old releases
diff --git a/tests/create-and-run.sh b/tests/create-and-run.sh
index fab04bc..9788790 100755
--- a/tests/create-and-run.sh
+++ b/tests/create-and-run.sh
@@ -61,6 +61,9 @@ elif test -n "$MIRROR"; then
fi
debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -r "$RELEASE" "$@"
+# Work around qemu #1106792
+export OMP_THREAD_LIMIT=1
+
SSH_PORT=2222
timeout 600s debvm-run -s "$SSH_PORT" -i "$IMAGE" &
set -- localhost
diff --git a/tests/dist-upgrades.sh b/tests/dist-upgrades.sh
index 171500a..e79a57c 100755
--- a/tests/dist-upgrades.sh
+++ b/tests/dist-upgrades.sh
@@ -43,6 +43,9 @@ ssh-keygen -f "$SSH_KEYPATH" -N ''
debvm-create --sshkey="$SSH_KEYPATH.pub" -r jessie --size=3G --
--customize-hook="copy-in upgrade /usr/local/bin"
http://archive.debian.org/debian
+# Work around qemu #1106792
+export OMP_THREAD_LIMIT=1
+
SSH_PORT=2222
for RELEASE in stretch buster bullseye bookworm trixie sid; do
timeout 15m debvm-run -s "$SSH_PORT" &
diff --git a/tests/efi-create-and-run.sh b/tests/efi-create-and-run.sh
index 2b70662..6347743 100755
--- a/tests/efi-create-and-run.sh
+++ b/tests/efi-create-and-run.sh
@@ -36,6 +36,9 @@ if test -z "$RELEASE"; then
fi
debefivm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -r "$RELEASE" -a
"$ARCHITECTURE" "$@"
+# Work around qemu #1106792
+export OMP_THREAD_LIMIT=1
+
SSH_PORT=2222
timeout 600s debefivm-run -s "$SSH_PORT" -i "$IMAGE" &
set -- localhost
