From 4de4e7c2b4a33da70d16c47c2524a5e791390d44 Mon Sep 17 00:00:00 2001 From: Luke Yang Date: Mon, 25 Sep 2023 14:50:01 -0400 Subject: [PATCH] container: Add `dir` container deploy test This change adds an integration test for deploying from a container image stored in a local directory. It is directly related a recent change to support the `dir:` transport when using `ostree container image deploy`. --- ci/priv-integration.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/priv-integration.sh b/ci/priv-integration.sh index 1de1060c..d25c92a7 100755 --- a/ci/priv-integration.sh +++ b/ci/priv-integration.sh @@ -86,7 +86,9 @@ RUN touch /usr/share/somefile EOF systemd-run -dP --wait podman build -t localhost/fcos-derived . derived_img=oci:/var/tmp/derived.oci +derived_img_dir=dir:/var/tmp/derived.dir systemd-run -dP --wait skopeo copy containers-storage:localhost/fcos-derived "${derived_img}" +systemd-run -dP --wait skopeo copy "${derived_img}" "${derived_img_dir}" # Prune to reset state ostree refs ostree/container/image --delete @@ -106,6 +108,12 @@ img_commit2=$(ostree --repo=${repo} rev-parse ostree/container/image/${imgref}) test "${img_commit}" = "${img_commit2}" echo "ok deploy derived container identical revs" +ostree-ext-cli container image deploy --sysroot "${sysroot}" \ + --stateroot "${stateroot}" --imgref ostree-unverified-image:"${derived_img_dir}" +echo "ok deploy derived container from local dir" +ostree-ext-cli container image remove --repo "${repo}" "${derived_img_dir}" +rm -rf /var/tmp/derived.dir + # Verify policy mkdir -p /etc/pki/containers