From 4bac7836be6834e0f5ff9c3ac636ce799e55cec6 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 25 Nov 2024 16:34:44 -0500
Subject: [PATCH] Drop test references to /dev and /var/lib/containers mounts

Keep the bind mounts in the docs though for now because many
people will be using the current docs with older bootc.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 hack/lldb/deploy.sh                    | 2 +-
 ostree-ext/.github/workflows/bootc.yml | 2 +-
 tests-integration/src/install.rs       | 4 ----
 tests/e2e/bootc-install.sh             | 2 --
 tests/e2e/playbooks/install.yaml       | 2 --
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/hack/lldb/deploy.sh b/hack/lldb/deploy.sh
index 99adad6a7..04941f22c 100755
--- a/hack/lldb/deploy.sh
+++ b/hack/lldb/deploy.sh
@@ -11,7 +11,7 @@ sudo podman build --build-arg "sshpubkey=$(cat ~/.ssh/id_rsa.pub)" -f Containerf
 mkdir -p ~/.cache/bootc-dev/disks
 rm -f ~/.cache/bootc-dev/disks/lldb.raw
 truncate -s 10G ~/.cache/bootc-dev/disks/lldb.raw
-sudo podman run --pid=host --network=host --privileged --security-opt label=type:unconfined_t -v /dev:/dev -v /var/lib/containers:/var/lib/containers -v ~/.cache/bootc-dev/disks:/output -v /dev:/dev localhost/bootc-lldb bootc install to-disk --via-loopback --generic-image --skip-fetch-check /output/lldb.raw
+sudo podman run --pid=host --network=host --privileged --security-opt label=type:unconfined_t -v ~/.cache/bootc-dev/disks:/output -v /dev:/dev localhost/bootc-lldb bootc install to-disk --via-loopback --generic-image --skip-fetch-check /output/lldb.raw
 
 # create a new VM in libvirt
 set +e
diff --git a/ostree-ext/.github/workflows/bootc.yml b/ostree-ext/.github/workflows/bootc.yml
index 2f0d0b22c..bba4cfe7d 100644
--- a/ostree-ext/.github/workflows/bootc.yml
+++ b/ostree-ext/.github/workflows/bootc.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Integration tests
         run: |
           set -xeuo pipefail
-          sudo podman run --rm -ti --privileged -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
+          sudo podman run --rm -ti --privileged -v /:/target -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
             quay.io/centos-bootc/centos-bootc-dev:stream9 bootc install to-filesystem \
             --karg=foo=bar --disable-selinux --replace=alongside /target
 
diff --git a/tests-integration/src/install.rs b/tests-integration/src/install.rs
index b21886daa..41866bca5 100644
--- a/tests-integration/src/install.rs
+++ b/tests-integration/src/install.rs
@@ -16,10 +16,6 @@ pub(crate) const BASE_ARGS: &[&str] = &[
     "run",
     "--rm",
     "--privileged",
-    "-v",
-    "/dev:/dev",
-    "-v",
-    "/var/lib/containers:/var/lib/containers",
     "--pid=host",
     "--security-opt",
     "label=disable",
diff --git a/tests/e2e/bootc-install.sh b/tests/e2e/bootc-install.sh
index c2ad7a4d2..52b186d9b 100755
--- a/tests/e2e/bootc-install.sh
+++ b/tests/e2e/bootc-install.sh
@@ -234,8 +234,6 @@ case "$TEST_CASE" in
             --privileged \
             --pid=host \
             --security-opt label=type:unconfined_t \
-            -v /var/lib/containers:/var/lib/containers \
-            -v /dev:/dev \
             -v .:/output \
             "$TEST_IMAGE_URL" \
             bootc install to-disk --filesystem "$ROOTFS" --generic-image --via-loopback /output/disk.raw
diff --git a/tests/e2e/playbooks/install.yaml b/tests/e2e/playbooks/install.yaml
index 876c0ddeb..715b99597 100644
--- a/tests/e2e/playbooks/install.yaml
+++ b/tests/e2e/playbooks/install.yaml
@@ -54,9 +54,7 @@
          --privileged \
          --tls-verify=false \
          --pid=host \
-         -v /dev:/dev \
          -v /:/target \
-         -v /var/lib/containers:/var/lib/containers \
          --security-opt label=type:unconfined_t \
          {{ test_image_url }} \
          bootc install to-existing-root"