launchpad-reviewers team mailing list archive

[Tom Wardill <tom.wardill@xxxxxxxxxxxxx>]

Tom Wardill has proposed merging ~twom/lpbuildbot-worker:dont-use-tmpfs into lpbuildbot-worker:main.

Commit message:
Revert tmpfs changes

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~twom/lpbuildbot-worker/+git/lpbuildbot-worker/+merge/390756
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/lpbuildbot-worker:dont-use-tmpfs into lpbuildbot-worker:main.

diff --git a/lp-setup-lxd-build b/lp-setup-lxd-build
index 22ebc40..ba2d386 100755
--- a/lp-setup-lxd-build
+++ b/lp-setup-lxd-build
@@ -51,10 +51,7 @@ def start_new_container(client, image_name, work_dir):
                 getpwnam("buildbot").pw_uid, getpwnam("buildbot").pw_gid
             )
         },
-        "devices": {
-            "root": {"type": "disk", "path": "/", "pool": "lxdtmpfs"},
-            "build": {"path": work_dir, "source": work_dir, "type": "disk"},
-        },
+        "devices": {"build": {"path": work_dir, "source": work_dir, "type": "disk"}},
     }
     container = client.containers.create(image_data, wait=True)
     print("Starting container", flush=True)
diff --git a/lp-setup-lxd-test b/lp-setup-lxd-test
index 745ba75..c428ee6 100755
--- a/lp-setup-lxd-test
+++ b/lp-setup-lxd-test
@@ -44,9 +44,6 @@ def create_ephemeral_container(
         "ephemeral": True,
         "profiles": ["default"],
         "source": {"type": "copy", "source": image_name},
-        "devices": {
-            "root": {"type": "disk", "path": "/", "pool": "lxdtmpfs"},
-        },
     }
 
     test_container = client.containers.create(instance_config, wait=True)