Merge ~rbalint/ubuntu/+source/systemd:tests-in-lxd into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-groovy

[Balint Reczey]

New upstream releases keep breaking tests (and functionality) in LXD containers, this test helps detecting such breakages earlier.
I'd like to make the test part of the upstream test-suite later, when it supports locally built binary packages.

[Balint Reczey (rbalint)]

There is one more unittest failing, i need to patch that, too, before this can be merged.

[Balint Reczey (rbalint)]

OK, now this passes locally in lxd.

[Dan Streetman (ddstreet)]

LGTM with just minor comments inline below.

[Dan Streetman (ddstreet)]

review: Approve

diff --git a/debian/patches/series b/debian/patches/series
index 48bcae4..8b267f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,3 +59,4 @@ Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
 riscv64-seccomp.patch
 dhcp-Allow-setting-request-options-again.patch
 lp1860926-network-Change-IgnoreCarrierLoss-default-to-value-of.patch
+test-Skip-test-boot-timestamps-on-permission-denied.patch
diff --git a/debian/patches/test-Skip-test-boot-timestamps-on-permission-denied.patch b/debian/patches/test-Skip-test-boot-timestamps-on-permission-denied.patch
 new file mode 100644
index 0000000..1acfe77
--- /dev/null
+++ b/debian/patches/test-Skip-test-boot-timestamps-on-permission-denied.patch
@@ -0,0 +1,41 @@
+From: Balint Reczey <[e-mail]>
+Date: Tue, 5 May 2020 21:24:53 +0200
+Subject: test: Skip test-boot-timestamps on permission denied
+Forwarded: https://github.com/systemd/systemd/pull/15728
+
+In containers even root can be denied to access the needed files.
+---
+ src/test/test-boot-timestamps.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
+index 3c7f7a9..29074ec 100644
+--- a/src/test/test-boot-timestamps.c
++++ b/src/test/test-boot-timestamps.c
+@@ -17,7 +17,7 @@ static int test_acpi_fpdt(void) {
+ 
+         r = acpi_get_boot_usec(&loader_start, &loader_exit);
+         if (r < 0) {
+-                bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -ENODATA;
++                bool ok = r == -ENOENT || r == -EACCES || r == -ENODATA;
+ 
+                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read ACPI FPDT: %m");
+                 return ok ? 0 : r;
+@@ -37,7 +37,7 @@ static int test_efi_loader(void) {
+ 
+         r = efi_loader_get_boot_usec(&loader_start, &loader_exit);
+         if (r < 0) {
+-                bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP;
++                bool ok = r == -ENOENT || r == -EACCES || r == -EOPNOTSUPP;
+ 
+                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read EFI loader data: %m");
+                 return ok ? 0 : r;
+@@ -59,7 +59,7 @@ static int test_boot_timestamps(void) {
+ 
+         r = boot_timestamps(NULL, &fw, &l);
+         if (r < 0) {
+-                bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP;
++                bool ok = r == -ENOENT || r == -EACCES || r == -EOPNOTSUPP;
+ 
+                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read variables: %m");
+                 return ok ? 0 : r;
diff --git a/debian/tests/control b/debian/tests/control
index c6aef85..febf6a9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -120,6 +120,15 @@ Depends: systemd-tests,
   dbus-user-session,
 Restrictions: needs-root, allow-stderr, isolation-container, breaks-testbed
 
+Tests: tests-in-lxd
+Depends: systemd-tests,
+  udev,
+  libpam-systemd,
+  autopkgtest,
+  lsb-release,
+  lxd
+Restrictions: needs-root, allow-stderr, isolation-machine, breaks-testbed, skip-not-installable
+
 Tests: upstream
 Depends: libsystemd-dev,
   tree,
diff --git a/debian/tests/root-unittests b/debian/tests/root-unittests
index 96416e2..bf8202a 100644
--- a/debian/tests/root-unittests
+++ b/debian/tests/root-unittests
@@ -8,6 +8,8 @@ for t in /usr/lib/systemd/tests/test-*; do
     tname=$(basename $t)
     # test-udev needs special prep and has its own test
     [ "$tname" != test-udev ] || continue
+    # test-execute fails in LXC LP: XXX
+    [ "$tname" != test-execute ] || ! systemd-detect-virt -c -q || continue
     echo "====== $tname ======="
     # exit code 77 means "skip"
     rc=0
diff --git a/debian/tests/tests-in-lxd b/debian/tests/tests-in-lxd
 new file mode 100644
index 0000000..1eba27d
--- /dev/null
+++ b/debian/tests/tests-in-lxd
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# run root-unittests in lxd
+
+set -eu
+
+lxd init --auto
+
+IMAGE=autopkgtest/ubuntu/$(lsb_release -cs)/$(dpkg --print-architecture)
+
+autopkgtest-build-lxd ubuntu-daily:$(lsb_release -cs)
+
+# push local apt configuration to match pinning
+lxc launch $IMAGE systemd-lxc
+lxc file push -r /etc/apt systemd-lxc/etc/
+lxc exec systemd-lxc -- sed -i 's|/tmp/autopkgtest.[^/]*/|/root/|' /etc/apt/sources.list.d/autopkgtest.list || true
+
+cd /tmp/autopkgtest.*/build.*/src
+
+# push potential locally built packages
+if [ -d ../../binaries ]; then
+    lxc file push -r ../../binaries systemd-lxc/root/
+fi
+
+# fix failing systemd-remount-fs.service LP: #1877078
+lxc file delete systemd-lxc/etc/fstab
+lxc exec  systemd-lxc touch /etc/fstab
+
+lxc stop systemd-lxc
+lxc publish systemd-lxc --alias $IMAGE
+
+for t in root-unittests boot-and-services; do
+    autopkgtest -U -B . --test-name=$t -- lxd $IMAGE || [ $? = 2 ] # see Debian's #960267
+done
+
+# also check tests in privileged containers
+lxc profile set default security.privileged "true"
+for t in root-unittests boot-and-services; do
+    autopkgtest -U -B . --test-name=$t -- lxd $IMAGE || [ $? = 2 ] # see Debian's #960267
+done