Merge ~slyon/netplan/+git/ubuntu:slyon/fix-cloud-init-reboot-arm64 into ~ubuntu-core-dev/netplan/+git/ubuntu:ubuntu/master

[Lukas Märdian]

Should be tested in Bileto first.

[Lukas Märdian (slyon)]

Confirmed to be working by laney in a manual test.

[Dimitri John Ledkov (xnox)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 7702dae..0bc76ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netplan.io (0.100-0ubuntu4) UNRELEASED; urgency=medium
+
+  * debian/tests/cloud-init
+    - Improve reboot test to avoid failure on arm64
+
+ -- Lukas Märdian <[e-mail]>  Mon, 21 Sep 2020 12:23:02 +0200
+
 netplan.io (0.100-0ubuntu3) groovy; urgency=medium
 
   * debian/tests:
diff --git a/debian/tests/cloud-init b/debian/tests/cloud-init
index 2a30d1f..577bb05 100755
--- a/debian/tests/cloud-init
+++ b/debian/tests/cloud-init
@@ -10,8 +10,6 @@ if [ ! -x /tmp/autopkgtest-reboot ]; then
     exit 0
 fi
 
-trap 'rm -f /etc/netplan/00test.yaml' EXIT INT QUIT PIPE TERM
-
 # parameters: service expect_running
 assert_is_running() {
     if [ "$2" = 1 ] && ! systemctl --quiet is-active "$1"; then
@@ -79,7 +77,7 @@ Type=oneshot
 # Keep it running, so we can verify it was properly started
 RemainAfterExit=yes
 # Simulate creating a new service unit (i.e. netplan-wpa-*.service / netplan-ovs-*.service)
-ExecStart=/bin/mv /netplan-dummy.service /run/systemd/system/
+ExecStart=/bin/cp /netplan-dummy.service /run/systemd/system/
 ExecStart=/usr/sbin/netplan generate
 EOF
 
@@ -104,8 +102,10 @@ EOF
         # Cleanup
         systemctl enable systemd-networkd.service
         systemctl disable cloud-init-dummy.service
+        rm /netplan-dummy.service
         rm /run/systemd/system/netplan-dummy.service
         rm /etc/systemd/system/cloud-init-dummy.service
+        rm /etc/netplan/00test.yaml
         ;;
 
     *)