test: add custom mountpoints for non-btrfs tests

When the rootfs type supports it, add extra mountpoints to the test build. Btrfs subvolumes are not supported.
osbuild · Aug 9, 2024 · 1d7ca7d · 1d7ca7d
1 parent 965a2ba
commit 1d7ca7d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/test/test_build.py b/test/test_build.py
@@ -202,12 +202,7 @@ def build_images(shared_tmpdir, build_container, request, force_aws_upload):
                     "groups": ["wheel"],
                 },
             ],
-            "filesystem": [
-                {
-                    "mountpoint": "/",
-                    "minsize": "12GiB"
-                },
-            ],
+            "filesystem": testutil.create_filesystem_customizations(tc.rootfs),
             "kernel": {
                 "append": kargs,
             },

diff --git a/test/testutil.py b/test/testutil.py
@@ -109,6 +109,37 @@ def deregister_ami(ami_id):
         print(f"Error {err_code}: {err_msg}")
 
 
+def create_filesystem_customizations(rootfs: str):
+    if rootfs == "btrfs":
+        # only minimal customizations are supported for btrfs currently
+        return [
+            {
+                "mountpoint": "/",
+                "minsize": "12 GiB"
+            },
+        ]
+
+    # add some custom mountpoints
+    return [
+        {
+            "mountpoint": "/",
+            "minsize": "12 GiB"
+        },
+        {
+            "mountpoint": "/var/data",
+            "minsize": "3 GiB"
+        },
+        {
+            "mountpoint": "/var/data/test",
+            "minsize": "1 GiB"
+        },
+        {
+            "mountpoint": "/var/opt",
+            "minsize": "2 GiB"
+        },
+    ]
+
+
 # podman_run_common has the common prefix for the podman run invocations
 podman_run_common = [
     "podman", "run", "--rm",