launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-buildd:fix-charm-snap-build-proxy into launchpad-buildd:master.

Commit message:
Actually pass proxy arguments through to build-charm

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/405750

Fixes incomplete implementation in https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/405623.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:fix-charm-snap-build-proxy into launchpad-buildd:master.

diff --git a/lpbuildd/charm.py b/lpbuildd/charm.py
index 0838fe7..dcfc546 100644
--- a/lpbuildd/charm.py
+++ b/lpbuildd/charm.py
@@ -50,6 +50,9 @@ class CharmBuildManager(SnapBuildProxyMixin, DebianBuildManager):
     def doRunBuild(self):
         """Run the process to build the charm."""
         args = []
+        args.extend(self.startProxy())
+        if self.revocation_endpoint:
+            args.extend(["--revocation-endpoint", self.revocation_endpoint])
         for snap, channel in sorted(self.channels.items()):
             args.extend(["--channel", "%s=%s" % (snap, channel)])
         if self.branch is not None:
@@ -65,6 +68,8 @@ class CharmBuildManager(SnapBuildProxyMixin, DebianBuildManager):
 
     def iterate_BUILD_CHARM(self, retcode):
         """Finished building the charm."""
+        self.stopProxy()
+        self.revokeProxyToken()
         if retcode == RETCODE_SUCCESS:
             print("Returning build status: OK")
             return self.deferGatherResults()