Merge ~chad.smith/curtin:ubuntu/devel into curtin:ubuntu/devel

[Chad Smith]

new-upstream-snapshot to publish into Cosmic

[Scott Moser (smoser)]

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:6294ad5e62b0448b60b68771acff08041258908d
https://jenkins.ubuntu.com/server/job/curtin-ci/1048/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1048
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1048
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1048
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1048

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/1048/rebuild

review: Approve (continuous-integration)

diff --git a/debian/changelog b/debian/changelog
index 6e3bffb..7d08e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+curtin (18.1-51-gb812ae80-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream snapshot.
+    - vmtest: ensure we collect /var/log/journal only once
+
+ -- Chad Smith <[e-mail]>  Tue, 21 Aug 2018 11:44:46 -0600
+
 curtin (18.1-50-g2d9b2c6f-0ubuntu1) cosmic; urgency=medium
 
   * New upstream snapshot.
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 0249655..bd159c4 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1801,21 +1801,25 @@ def generate_user_data(collect_scripts=None, apt_proxy=None,
         exit 0;
         """)
 
-    # add journal collection "last" before collect_post
     collect_journal = textwrap.dedent("""#!/bin/sh -x
         cd OUTPUT_COLLECT_D
         # sync and flush journal before copying (if journald enabled)
+        target="./var-log-journal"
         [ -e /var/log/journal ] && {
+            [ -e ${target} ] && {
+                echo "ERROR: ${target} dir exists; journal collected already";
+                exit 1;
+            }
             journalctl --sync --flush --rotate
-            cp -a /var/log/journal ./var-log-journal
-            gzip -9 ./var-log-journal/*/system*.journal
+            cp -a /var/log/journal ${target}
+            gzip -9 ${target}/*/system*.journal
         }
         exit 0;
         """)
-    collect_scripts.append(collect_journal)
 
+    # add journal collection "last" before collect_post
     scripts = ([collect_prep] + [copy_rootdir] + collect_scripts +
-               [collect_post] + [failsafe_poweroff])
+               [collect_journal] + [collect_post] + [failsafe_poweroff])
 
     for part in scripts:
         if not part.startswith("#!"):