tests: Add test dependencies and integration binary disambiguation

Add podman, skopeo, and xfsprogs to test dependencies for the
containers-storage integration tests coming next.

Disambiguate the integration test binary name in Justfile cargo
commands since the integration-tests crate will have multiple
binaries (the main test runner and a cleanup helper).

Assisted-by: OpenCode (Claude Opus 4)
Signed-off-by: Colin Walters <walters@verbum.org>

Author: cgwalters

Justfile

@@ -59,7 +59,7 @@ _test_image := if base_image =~ "debian" { "localhost/composefs-rs-test-debian:l
 
 # Run unprivileged integration tests against the cfsctl binary (no root, no VM)
 test-integration: build
-    CFSCTL_PATH=$(pwd)/target/debug/cfsctl cargo run -p integration-tests -- --skip privileged_
+    CFSCTL_PATH=$(pwd)/target/debug/cfsctl cargo run -p integration-tests --bin cfsctl-integration-tests -- --skip privileged_
 
 # Build the test container image for VM-based integration tests
 _integration-container-build:
@@ -69,7 +69,7 @@ _integration-container-build:
 test-integration-vm: build _integration-container-build
     COMPOSEFS_TEST_IMAGE={{_test_image}} \
         CFSCTL_PATH=$(pwd)/target/debug/cfsctl \
-        cargo run -p integration-tests
+        cargo run -p integration-tests --bin cfsctl-integration-tests
 
 # Run everything: checks + full integration tests including VM
 ci: check test-integration-vm

contrib/packaging/install-test-deps.sh

@@ -11,11 +11,12 @@ set -euo pipefail
 
 case "${ID}" in
     centos|fedora|rhel)
-        pkg_install composefs openssl
+        pkg_install composefs openssl podman skopeo xfsprogs
         ;;
     debian|ubuntu)
         pkg_install \
-            openssl e2fsprogs bubblewrap openssh-server
+            openssl e2fsprogs bubblewrap openssh-server \
+            podman skopeo
 
         # OSTree symlink targets — /root, /home, /srv, etc. are symlinks
         # into /var on OSTree systems, so the target directories must exist.