Merge ~paelzer/ubuntu/+source/libvirt:lp-1899180-flaky-smoke-lxc-FOCAL into ubuntu/+source/libvirt:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/lp-1899180-new/+packages

[Robie Basak (racb)]

Matches Hirsute upload. Since Hirsute isn't uploaded yet (as it was pending review), shall I leave it to you to upload all of these, and then all I need to do is check the upload matches these MPs and then let the SRU through?

review: Approve (sru)

[Christian Ehrhardt  (paelzer)]

I've uploaded Hirsute - after waiting a bit (build and some tests at least) I'll also upload these to the SRU queue.
I'd then ping you to get them processed - thanks in advance.

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libvirt
 * [new tag] upload/6.0.0-0ubuntu8.6 -> upload/6.0.0-0ubuntu8.6

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libvirt_6.0.0-0ubuntu8.6.dsc: done.
  Uploading libvirt_6.0.0-0ubuntu8.6.debian.tar.xz: done.
  Uploading libvirt_6.0.0-0ubuntu8.6_source.buildinfo: done.
  Uploading libvirt_6.0.0-0ubuntu8.6_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index c4f2b0d..e043ce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libvirt (6.0.0-0ubuntu8.6) focal; urgency=medium
+
+  * Improve flaky smoke-lxc test (LP: #1899180)
+    - d/t/control, d/t/smoke-lxc: retry service restart and skip test if
+      failing; This was flaky on some release/architectures
+    - d/t/smoke-lxc: retry check_domain being flaky on arm64
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 08 Dec 2020 15:09:17 +0100
+
 libvirt (6.0.0-0ubuntu8.5) focal; urgency=medium
 
   * d/p/ubuntu/lp-1887490-*: add named types and definitions for EPYC-Rome
diff --git a/debian/tests/control b/debian/tests/control
index 92766be..065bc8e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -9,7 +9,7 @@ Restrictions: allow-stderr, isolation-container
 
 Tests: smoke-lxc
 Depends: libvirt-daemon-system, libvirt-daemon-driver-lxc, libvirt-clients, libxml2-utils
-Restrictions: allow-stderr, needs-root, isolation-machine
+Restrictions: allow-stderr, needs-root, isolation-machine, skippable
 
 Tests: build-test
 Depends: libvirt-dev, build-essential, pkg-config
diff --git a/debian/tests/smoke-lxc b/debian/tests/smoke-lxc
index 081854a..344c000 100755
--- a/debian/tests/smoke-lxc
+++ b/debian/tests/smoke-lxc
@@ -16,10 +16,36 @@ cleanup()
    fi
 }
 
+try_check_domain()
+{
+    for _ in $(seq 10); do
+        check_domain && return
+        sleep 2s
+    done
+    echo "Known to be unreliable on test infrastructure - skipping"
+    exit 77
+}
+
 check_domain()
 {
-  virsh list | grep -qs "${DOMAIN}[[:space:]]\+running"
-  virsh lxc-enter-namespace --noseclabel ${DOMAIN} /bin/ls /bin/ls
+    rc=0
+    virsh list | grep -qs "${DOMAIN}[[:space:]]\+running"
+    rc=$((rc+$?))
+    virsh lxc-enter-namespace --noseclabel ${DOMAIN} /bin/ls /bin/ls
+    rc=$((rc+$?))
+    return $rc
+}
+
+try_restart_libvirtd()
+{
+    for _ in $(seq 10); do
+        systemctl restart libvirtd && return
+        sleep 2s
+    done
+    # This turned out to be flaky, non reproducible outside of LP-infra and
+    # is not what we want to test, Skip the test in this case
+    echo "Restart failed while checking for container-survival-through restart - skipping".
+    exit 77
 }
 
 trap cleanup EXIT
@@ -35,10 +61,10 @@ rm -f /var/log/libvirt/lxc/sl.log
 virsh start ${DOMAIN}
 # Check virtlogd is running
 grep -qs "starting up" /var/log/libvirt/lxc/sl.log
-check_domain
+try_check_domain
 # Make sure a restart doesn't termiante the domain
-systemctl restart libvirtd
-check_domain
+try_restart_libvirtd
+try_check_domain
 virsh destroy ${DOMAIN} || true
 virsh undefine ${DOMAIN}
 CLEANED_UP=1