Merge ~vorlon/launchpad-buildd:main into launchpad-buildd:master

[Steve Langasek]

The purpose of this is to provide a generic interface for requesting cherry-picks of packages from the -proposed pocket when building images, for the purpose of doing per-package, image-level verification of SRUs.

This is particularly relevant for packages included in cloud images - e.g. cloud-init whose behavior at first boot of an image is important for an SRU.

The interface is modeled on autopkgtest's existing --apt-pocket commandline option.

[John Chittum (jchittum)]

review: Approve

[Philip Roche (philroche)]

review: Needs Information

[Philip Roche (philroche)]

review: Approve

Unmerged commits

1043395... by Steve Langasek on 2022-05-04

Support passing apt pocket arguments to livecd-rootfs

This uses the same semantics as --apt-pocket option to autopkgtest

diff --git a/lpbuildd/livefs.py b/lpbuildd/livefs.py
index f627e76..37aeba9 100644
--- a/lpbuildd/livefs.py
+++ b/lpbuildd/livefs.py
@@ -62,6 +62,9 @@ class LiveFilesystemBuildManager(DebianBuildManager):
             args.extend(["--image-format", self.image_format])
         if self.pocket == "proposed":
             args.append("--proposed")
+        elif type(self.pocket) is list:
+            for pocket in self.pocket:
+                args.extend(["--apt-pocket", pocket])
         if self.locale:
             args.extend(["--locale", self.locale])
         for ppa in self.extra_ppas:
diff --git a/lpbuildd/target/build_livefs.py b/lpbuildd/target/build_livefs.py
index 1d576d0..c951d43 100644
--- a/lpbuildd/target/build_livefs.py
+++ b/lpbuildd/target/build_livefs.py
@@ -69,6 +69,13 @@ class BuildLiveFS(SnapStoreOperationMixin, Operation):
             "--extra-snap", dest="extra_snaps", default=[], action="append",
             help="use this additional snap")
         parser.add_argument(
+            "--apt-pocket", dest="apt_pocket", default=[], action="append",
+            metavar="POCKETNAME",
+            help="Enable additional apt source for release-POCKETNAME. "
+                 "If packages are given, set up apt pinning to use only "
+                 "those packages from release-POCKETNAME; src:srcname "
+                 "expands to all binaries of srcname")
+        parser.add_argument(
             "--channel", metavar="CHANNEL",
             help="pull snaps from channel CHANNEL for ubuntu-core image")
         parser.add_argument(
@@ -132,6 +139,8 @@ class BuildLiveFS(SnapStoreOperationMixin, Operation):
                     self.args.repo_snapshot_stamp)
             if self.args.cohort_key:
                 base_lb_env["COHORT_KEY"] = self.args.cohort_key
+            if self.args.apt_pocket:
+                base_lb_env["APT_POCKET"] = " ".join(self.args.apt_pocket)
             lb_env = base_lb_env.copy()
             lb_env["SUITE"] = self.args.series
             if self.args.datestamp is not None:
diff --git a/lpbuildd/target/tests/test_build_livefs.py b/lpbuildd/target/tests/test_build_livefs.py
index e8fa92a..64dc230 100644
--- a/lpbuildd/target/tests/test_build_livefs.py
+++ b/lpbuildd/target/tests/test_build_livefs.py
@@ -156,6 +156,38 @@ class TestBuildLiveFS(TestCase):
                 ["lb", "build"], PROJECT="ubuntu-core", ARCH="amd64"),
             ]))
 
+    def test_build_apt_pocket(self):
+        args = [
+            "buildlivefs",
+            "--backend=fake", "--series=jammy", "--arch=amd64", "1",
+            "--project=ubuntu",
+            "--apt-pocket", "proposed=src:src1",
+            "--apt-pocket", "proposed=pkg2",
+            ]
+        build_livefs = parse_args(args=args).operation
+        build_livefs.build()
+        self.assertThat(build_livefs.backend.run.calls, MatchesListwise([
+            RanBuildCommand(["rm", "-rf", "auto", "local"]),
+            RanBuildCommand(["mkdir", "-p", "auto"]),
+            RanBuildCommand(
+                ["ln", "-s",
+                 "/usr/share/livecd-rootfs/live-build/auto/config", "auto/"]),
+            RanBuildCommand(
+                ["ln", "-s",
+                 "/usr/share/livecd-rootfs/live-build/auto/build", "auto/"]),
+            RanBuildCommand(
+                ["ln", "-s",
+                 "/usr/share/livecd-rootfs/live-build/auto/clean", "auto/"]),
+            RanBuildCommand(["lb", "clean", "--purge"]),
+            RanBuildCommand(
+                ["lb", "config"],
+                PROJECT="ubuntu", ARCH="amd64", SUITE="jammy",
+                APT_POCKET="proposed=src:src1 proposed=pkg2"),
+            RanBuildCommand(
+                ["lb", "build"], PROJECT="ubuntu", ARCH="amd64",
+                APT_POCKET="proposed=src:src1 proposed=pkg2"),
+            ]))
+
     def test_build_debug(self):
         args = [
             "buildlivefs",
diff --git a/lpbuildd/tests/test_livefs.py b/lpbuildd/tests/test_livefs.py
index d121837..a2b5c1c 100644
--- a/lpbuildd/tests/test_livefs.py
+++ b/lpbuildd/tests/test_livefs.py
@@ -149,6 +149,19 @@ class TestLiveFilesystemBuildManagerIteration(TestCase):
                 ])
 
     @defer.inlineCallbacks
+    def test_iterate_apt_pocket(self):
+        # The build manager can be told to specify apt pockets for different
+        # packages on the backend.
+        yield self.startBuild(
+            args={
+                "pocket": ["proposed=src:apt", "proposed=python3-apt"],
+                },
+            options=[
+                "--apt-pocket", "proposed=src:apt",
+                "--apt-pocket", "proposed=python3-apt",
+                ])
+
+    @defer.inlineCallbacks
     def test_iterate_snap_store_proxy(self):
         # The build manager can be told to use a snap store proxy.
         self.builder._config.set(