From 48a4419705c6427dbbf9c4ba46abb7d240832bd4 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 16 Nov 2022 15:15:06 +0100
Subject: [PATCH] test/data: persist the journal for ostree images

Include the new journald config stage to configure journald to
persist the journal. This is needed since we don't create the
`/var/log/journal` directory that journald uses to switch the
default to persistent storage. But instead of creating that
directory, we explicitly configure journald via the new stage.
This is also what Fedora CoreOS does.
---
 test/data/manifests/fedora-ostree-commit.json     | 11 +++++++++++
 test/data/manifests/fedora-ostree-commit.mpp.json | 11 +++++++++++
 test/data/manifests/fedora-ostree-image.json      | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/test/data/manifests/fedora-ostree-commit.json b/test/data/manifests/fedora-ostree-commit.json
index ff8a1d9d..230a53d4 100644
--- a/test/data/manifests/fedora-ostree-commit.json
+++ b/test/data/manifests/fedora-ostree-commit.json
@@ -901,6 +901,17 @@
             "language": "en_US.UTF-8"
           }
         },
+        {
+          "type": "org.osbuild.systemd-journald",
+          "options": {
+            "filename": "10-persistent.conf",
+            "config": {
+              "Journal": {
+                "Storage": "persistent"
+              }
+            }
+          }
+        },
         {
           "type": "org.osbuild.selinux",
           "options": {
diff --git a/test/data/manifests/fedora-ostree-commit.mpp.json b/test/data/manifests/fedora-ostree-commit.mpp.json
index e88a1b9d..bb388f8a 100644
--- a/test/data/manifests/fedora-ostree-commit.mpp.json
+++ b/test/data/manifests/fedora-ostree-commit.mpp.json
@@ -108,6 +108,17 @@
             "language": "en_US.UTF-8"
           }
         },
+        {
+          "type": "org.osbuild.systemd-journald",
+          "options": {
+            "filename": "10-persistent.conf",
+            "config": {
+              "Journal": {
+                "Storage": "persistent"
+              }
+            }
+          }
+        },
         {
           "type": "org.osbuild.selinux",
           "options": {
diff --git a/test/data/manifests/fedora-ostree-image.json b/test/data/manifests/fedora-ostree-image.json
index 4b434d62..e0978302 100644
--- a/test/data/manifests/fedora-ostree-image.json
+++ b/test/data/manifests/fedora-ostree-image.json
@@ -901,6 +901,17 @@
             "language": "en_US.UTF-8"
           }
         },
+        {
+          "type": "org.osbuild.systemd-journald",
+          "options": {
+            "filename": "10-persistent.conf",
+            "config": {
+              "Journal": {
+                "Storage": "persistent"
+              }
+            }
+          }
+        },
         {
           "type": "org.osbuild.selinux",
           "options": {