Merge ~cjwatson/launchpad-buildd:charmcraft-managed into launchpad-buildd:master

[Colin Watson]

Run charmcraft in managed mode

Since we're providing Launchpad-flavoured LXD containers for charmcraft rather than having it start its own, we need to run it in managed mode and install a few more dependencies for it.

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/launchpad-buildd/77/

diff --git a/debian/changelog b/debian/changelog
index 2c14e1e..95e4c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ launchpad-buildd (198) UNRELEASED; urgency=medium
   * Run charmcraft in verbose mode.
   * Honour proxy arguments when building charms.
   * Install charmcraft with --classic.
+  * Run charmcraft in managed mode.
 
  -- Colin Watson <[e-mail]>  Fri, 09 Jul 2021 14:08:58 +0100
 
diff --git a/lpbuildd/target/build_charm.py b/lpbuildd/target/build_charm.py
index 3550117..b2cb740 100644
--- a/lpbuildd/target/build_charm.py
+++ b/lpbuildd/target/build_charm.py
@@ -80,6 +80,11 @@ class BuildCharm(SnapBuildProxyOperationMixin, VCSOperationMixin,
                 if self.backend.is_package_available(dep):
                     deps.append(dep)
         deps.extend(self.vcs_deps)
+        # See charmcraft.provider.CharmcraftBuilddBaseConfiguration.setup.
+        deps.extend([
+            "python3-pip",
+            "python3-setuptools",
+            ])
         self.backend.run(["apt-get", "-y", "install"] + deps)
         if self.args.backend in ("lxd", "fake"):
             self.snap_store_set_proxy()
@@ -115,11 +120,16 @@ class BuildCharm(SnapBuildProxyOperationMixin, VCSOperationMixin,
             self.args.build_path)
         check_path_escape(self.buildd_path, build_context_path)
         env = OrderedDict()
+        env["CHARMCRAFT_MANAGED_MODE"] = "1"
         if self.args.proxy_url:
             env["http_proxy"] = self.args.proxy_url
             env["https_proxy"] = self.args.proxy_url
             env["GIT_PROXY_COMMAND"] = "/usr/local/bin/snap-git-proxy"
-        args = ["charmcraft", "build", "-v", "-f", build_context_path]
+        args = [
+            "charmcraft", "build", "-v",
+            "-p", build_context_path,
+            "-f", build_context_path,
+            ]
         self.run_build_command(args, env=env)
 
     def run(self):
diff --git a/lpbuildd/target/tests/test_build_charm.py b/lpbuildd/target/tests/test_build_charm.py
index dc0dad6..ae1da6a 100644
--- a/lpbuildd/target/tests/test_build_charm.py
+++ b/lpbuildd/target/tests/test_build_charm.py
@@ -117,7 +117,7 @@ class TestBuildCharm(TestCase):
         build_snap = parse_args(args=args).operation
         build_snap.install()
         self.assertThat(build_snap.backend.run.calls, MatchesListwise([
-            RanAptGet("install", "bzr"),
+            RanAptGet("install", "bzr", "python3-pip", "python3-setuptools"),
             RanSnap("install", "--channel=candidate", "core"),
             RanSnap("install", "--channel=beta", "core18"),
             RanSnap("install", "--classic", "--channel=edge", "charmcraft"),
@@ -133,7 +133,7 @@ class TestBuildCharm(TestCase):
         build_charm = parse_args(args=args).operation
         build_charm.install()
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
-            RanAptGet("install", "bzr"),
+            RanAptGet("install", "bzr", "python3-pip", "python3-setuptools"),
             RanSnap("install", "--classic", "charmcraft"),
             RanCommand(["mkdir", "-p", "/home/buildd"]),
             ]))
@@ -147,7 +147,7 @@ class TestBuildCharm(TestCase):
         build_charm = parse_args(args=args).operation
         build_charm.install()
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
-            RanAptGet("install", "git"),
+            RanAptGet("install", "git", "python3-pip", "python3-setuptools"),
             RanSnap("install", "--classic", "charmcraft"),
             RanCommand(["mkdir", "-p", "/home/buildd"]),
             ]))
@@ -178,7 +178,7 @@ class TestBuildCharm(TestCase):
         build_charm = parse_args(args=args).operation
         build_charm.install()
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
-            RanAptGet("install", "git"),
+            RanAptGet("install", "git", "python3-pip", "python3-setuptools"),
             RanCommand(
                 ["snap", "ack", "/dev/stdin"], input_text=store_assertion),
             RanCommand(["snap", "set", "core", "proxy.store=store-id"]),
@@ -203,7 +203,9 @@ class TestBuildCharm(TestCase):
             os.fchmod(proxy_script.fileno(), 0o755)
         build_charm.install()
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
-            RanAptGet("install", "python3", "socat", "git"),
+            RanAptGet(
+                "install", "python3", "socat", "git",
+                "python3-pip", "python3-setuptools"),
             RanSnap("install", "--classic", "charmcraft"),
             RanCommand(["mkdir", "-p", "/home/buildd"]),
             ]))
@@ -355,9 +357,10 @@ class TestBuildCharm(TestCase):
         build_charm.build()
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
             RanBuildCommand(
-                ["charmcraft", "build", "-v", "-f",
-                 "/home/buildd/test-image/."],
-                cwd="/home/buildd/test-image"),
+                ["charmcraft", "build", "-v",
+                 "-p", "/home/buildd/test-image/.",
+                 "-f", "/home/buildd/test-image/."],
+                cwd="/home/buildd/test-image", CHARMCRAFT_MANAGED_MODE="1"),
             ]))
 
     def test_build_with_path(self):
@@ -372,9 +375,10 @@ class TestBuildCharm(TestCase):
         build_charm.build()
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
             RanBuildCommand(
-                ["charmcraft", "build", "-v", "-f",
-                 "/home/buildd/test-image/build-aux/"],
-                cwd="/home/buildd/test-image"),
+                ["charmcraft", "build", "-v",
+                 "-p", "/home/buildd/test-image/build-aux/",
+                 "-f", "/home/buildd/test-image/build-aux/"],
+                cwd="/home/buildd/test-image", CHARMCRAFT_MANAGED_MODE="1"),
             ]))
 
     def test_build_proxy(self):
@@ -387,14 +391,16 @@ class TestBuildCharm(TestCase):
         build_charm = parse_args(args=args).operation
         build_charm.build()
         env = {
+            "CHARMCRAFT_MANAGED_MODE": "1",
             "http_proxy": "http://proxy.example:3128/",
             "https_proxy": "http://proxy.example:3128/",
             "GIT_PROXY_COMMAND": "/usr/local/bin/snap-git-proxy",
             }
         self.assertThat(build_charm.backend.run.calls, MatchesListwise([
             RanBuildCommand(
-                ["charmcraft", "build", "-v", "-f",
-                 "/home/buildd/test-image/."],
+                ["charmcraft", "build", "-v",
+                 "-p", "/home/buildd/test-image/.",
+                 "-f", "/home/buildd/test-image/."],
                 cwd="/home/buildd/test-image", **env),
             ]))
 
@@ -409,14 +415,16 @@ class TestBuildCharm(TestCase):
         build_charm.backend.run = FakeRevisionID("42")
         self.assertEqual(0, build_charm.run())
         self.assertThat(build_charm.backend.run.calls, MatchesAll(
-            AnyMatch(RanAptGet("install", "bzr"),),
+            AnyMatch(RanAptGet(
+                "install", "bzr", "python3-pip", "python3-setuptools"),),
             AnyMatch(RanBuildCommand(
                 ["bzr", "branch", "lp:foo", "test-image"],
                 cwd="/home/buildd")),
             AnyMatch(RanBuildCommand(
-                ["charmcraft", "build", "-v", "-f",
-                 "/home/buildd/test-image/."],
-                cwd="/home/buildd/test-image")),
+                ["charmcraft", "build", "-v",
+                 "-p", "/home/buildd/test-image/.",
+                 "-f", "/home/buildd/test-image/."],
+                cwd="/home/buildd/test-image", CHARMCRAFT_MANAGED_MODE="1")),
             ))
 
     def test_run_install_fails(self):