launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lpbuildbot-worker:more-snap-bin into lpbuildbot-worker:main.

Commit message:
Add /snap/bin to $PATH in more places

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lpbuildbot-worker/+git/lpbuildbot-worker/+merge/390892

_exec now uses it.

The change to lp-setup-lxd-cleanup is currently unnecessary, but may save us some confusion later.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lpbuildbot-worker:more-snap-bin into lpbuildbot-worker:main.

diff --git a/create-lp-tests-lxd b/create-lp-tests-lxd
index 551c4f1..e821bc2 100755
--- a/create-lp-tests-lxd
+++ b/create-lp-tests-lxd
@@ -268,6 +268,12 @@ if __name__ == "__main__":
     os.environ.setdefault("DEBIAN_FRONTEND", "noninteractive")
     os.environ.setdefault("LANG", "C")
 
+    path_segments = os.environ["PATH"].split(":")
+    if "/snap/bin" not in path_segments:
+        print("Adding /snap/bin to path")
+        path_segments.insert(0, "/snap/bin")
+        os.environ["PATH"] = ":".join(path_segments)
+
     client = Client()
 
     delete_old_image(client, image_name)
diff --git a/lp-setup-lxd-build b/lp-setup-lxd-build
index 49a92c9..971d290 100755
--- a/lp-setup-lxd-build
+++ b/lp-setup-lxd-build
@@ -135,6 +135,12 @@ if __name__ == "__main__":
     # Work around xenial's pylxd not understanding the lxd snap.
     os.environ.setdefault("LXD_DIR", "/var/snap/lxd/common/lxd")
 
+    path_segments = os.environ["PATH"].split(":")
+    if "/snap/bin" not in path_segments:
+        print("Adding /snap/bin to path")
+        path_segments.insert(0, "/snap/bin")
+        os.environ["PATH"] = ":".join(path_segments)
+
     client = Client()
 
     container = start_new_container(client, args.name, args.work_dir)
diff --git a/lp-setup-lxd-cleanup b/lp-setup-lxd-cleanup
index 660a29e..72ca33e 100755
--- a/lp-setup-lxd-cleanup
+++ b/lp-setup-lxd-cleanup
@@ -34,6 +34,12 @@ if __name__ == "__main__":
     # Work around xenial's pylxd not understanding the lxd snap.
     os.environ.setdefault("LXD_DIR", "/var/snap/lxd/common/lxd")
 
+    path_segments = os.environ["PATH"].split(":")
+    if "/snap/bin" not in path_segments:
+        print("Adding /snap/bin to path")
+        path_segments.insert(0, "/snap/bin")
+        os.environ["PATH"] = ":".join(path_segments)
+
     client = Client()
 
     clean_up_containers(client, args.name)