test: add test for org.osbuild.container-deploy

stages/org.osbuild.container-deploy

@@ -54,14 +54,13 @@ def main(inputs, output):
     assert len(images) == 1
     image = list(images.values())[0]
 
-    with tempfile.TemporaryDirectory(dir="/var/tmp") as tmp:
+    with tempfile.TemporaryDirectory(dir="/var/tmp") as tmp_storage:
         with containers.container_source(image) as (_, source):
             subprocess.run(
-                ["skopeo", "copy", source, f"containers-storage:[overlay@{tmp}]image"],
+                ["skopeo", "copy", source, f"containers-storage:[overlay@{tmp_storage}]image"],
                 check=True,
             )
-
-        with mount_container(tmp, "image") as img:
+        with mount_container(tmp_storage, "image") as img:
             subprocess.run(["cp", "-a", f"{img}/.", f"{output}/"], check=True)
 
 

stages/test/test_container_deploy.py

@@ -0,0 +1,74 @@
+#!/usr/bin/python3
+
+import os
+import os.path
+import random
+import string
+import subprocess
+
+import pytest
+
+from osbuild.testutil import has_executable, make_fake_tree
+from osbuild.testutil.imports import import_module_from_path
+
+
+def make_container(tmp_path, tag, fake_content, base="scratch"):
+    fake_container_src = tmp_path / "fake-container-src"
+    make_fake_tree(fake_container_src, fake_content)
+    fake_containerfile_path = fake_container_src / "Containerfile"
+    container_file_content = f"""
+    FROM {base}
+    COPY . .
+    """
+    fake_containerfile_path.write_text(container_file_content, encoding="utf8")
+    subprocess.check_call([
+        "podman", "build",
+        "--no-cache",
+        "-f", os.fspath(fake_containerfile_path),
+        "-t", tag,
+    ])
+
+
+@pytest.mark.skipif(os.getuid() != 0, reason="needs root")
+@pytest.mark.skipif(not has_executable("podman"), reason="no podman executable")
+def test_container_deploy_integration(tmp_path):
+    stage_path = os.path.join(os.path.dirname(__file__), "../org.osbuild.container-deploy")
+    stage = import_module_from_path("stage", stage_path)
+
+    # build two containers and overlay files to test for
+    # https://github.com/containers/storage/issues/1779
+    base_tag = "cont-base-" + "".join(random.choices(string.digits, k=12))
+    make_container(tmp_path, base_tag, {"file1": "file1 from base"})
+    cont_tag = "cont" + "".join(random.choices(string.digits, k=12))
+    make_container(tmp_path, cont_tag, {"file1": "file1 from final layer"}, base_tag)
+    # export for the container-deploy stage
+    fake_container_dst = tmp_path / "fake-container"
+    subprocess.check_call([
+        "podman", "save",
+        "--format=oci-archive",
+        f"--output={fake_container_dst}",
+        cont_tag,
+    ])
+    # and remove from podman
+    subprocess.check_call(["podman", "rmi", cont_tag, base_tag])
+
+    inputs = {
+        "images": {
+            # seems to be unused with fake_container_path?
+            "path": fake_container_dst,
+            "data": {
+                "archives": {
+                    fake_container_dst: {
+                        "format": "oci-archive",
+                        "name": cont_tag,
+                    },
+                },
+            },
+        },
+    }
+    output_dir = tmp_path / "output"
+
+    stage.main(inputs, output_dir)
+
+    assert output_dir.exists()
+    assert (output_dir / "file1").read_bytes() == b"file1 from final layer"