Merge ~alexsander-souza/maas-ci/+git/system-tests:export_bin_journal into ~maas-committers/maas-ci/+git/system-tests:master

[Alexsander de Souza]

export complete system journal

exports system logs using the Journal Export Format (https://systemd.io/JOURNAL_EXPORT_FORMATS#journal-export-format)

This format can be converted back to the binary journal and filtered using regular journalctl options:

$ xzcat journal.xz | /lib/systemd/systemd-journal-remote -o test.journal -
$ journalctl --file=test.journal $ARGS

[MAAS Lander (maas-lander)]

UNIT TESTS
-b export_bin_journal lp:~alexsander-souza/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/system-tests-tester/707/console
COMMIT: dfbad6de000561aa285aca3b839affe08e87adef

review: Needs Fixing

b552395... by Alexsander de Souza on 2023-09-11

format

[MAAS Lander (maas-lander)]

UNIT TESTS
-b export_bin_journal lp:~alexsander-souza/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/system-tests-tester/708/console
COMMIT: b3acfa67e57894e655ad86b9adf9c37182c160e8

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b export_bin_journal lp:~alexsander-souza/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/system-tests-tester/709/console
COMMIT: b5523958f840b4c1840865c5ac9727d70115080c

review: Needs Fixing

556ec83... by Alexsander de Souza on 2023-09-11

fix mypy compatibility

latest mypy don't like this ignore

[MAAS Lander (maas-lander)]

UNIT TESTS
-b export_bin_journal lp:~alexsander-souza/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 556ec834e6e2e6530f70fa7c5264ec472046b6e3

review: Approve

[Christian Grabowski (cgrabowski)]

+1

review: Approve

diff --git a/systemtests/collect_sos_report/test_collect.py b/systemtests/collect_sos_report/test_collect.py
index 8b275b2..7dfa70f 100644
--- a/systemtests/collect_sos_report/test_collect.py
+++ b/systemtests/collect_sos_report/test_collect.py
@@ -12,19 +12,23 @@ if TYPE_CHECKING:
 
 def collect_sos_report(instance: Instance, output: Path) -> None:
     container_tmp = "/tmp/sosreport"
-    output_dir = output / "sosreport"
     instance.execute(["apt", "install", "--yes", "sosreport"])
     instance.execute(["rm", "-rf", container_tmp])
     instance.execute(["mkdir", "-p", container_tmp])
     instance.execute(
         ["sos", "report", "--batch", "-o", "maas", "--tmp-dir", container_tmp]
     )
-    output_dir.mkdir(parents=True, exist_ok=True)
-    journalctl = instance.execute(
-        ["journalctl", "--unit=vault", "--no-pager", "--output=cat"]
+    instance.execute(
+        [
+            "sh",
+            "-c",
+            "journalctl --since='-12h' --output=export "
+            f"| xz > {container_tmp}/journal.xz",
+        ]
     )
-    if journalctl.stdout:
-        (output_dir / "vault-journal").write_text(journalctl.stdout)
+
+    output_dir = output / "sosreport"
+    output_dir.mkdir(parents=True, exist_ok=True)
     with tempfile.TemporaryDirectory(prefix="sosreport") as tempdir:
         instance.files[container_tmp].pull(tempdir)
         for f in (Path(tempdir) / "sosreport").iterdir():
diff --git a/systemtests/conftest.py b/systemtests/conftest.py
index 6acabf7..08b5280 100644
--- a/systemtests/conftest.py
+++ b/systemtests/conftest.py
@@ -194,7 +194,7 @@ def pytest_report_header(config: pytest.Config) -> list[str]:
     return headers + ["END_SYSTEMTESTS_META"]
 
 
[e-mail](tryfirst=True, hookwrapper=True)  # type: ignore
[e-mail](tryfirst=True, hookwrapper=True)
 def pytest_runtest_makereport(item: Any, call: Any) -> Iterator[Any]:
     # execute all other hooks to obtain the report object
     del call