Merge ~mwhudson/ubuntu-cdimage:simplify-germinate-output into ubuntu-cdimage:main

[Michael Hudson-Doyle]

write a per-arch list of packages to include in the pool

Currently the way cdimage tells debian-cd which packages to include in
the pool via this absurd mechanism involving the C preprocessor on the
debian-cd side. But cdimage knows exactly which packages to include, so
write a simple file with the list of packages we want (alongside the
current silliness, for now).

Unmerged commits

0db52e1... by Michael Hudson-Doyle on 2024-02-19

write a per-arch list of packages to include in the pool

Currently the way cdimage tells debian-cd which packages to include in
the pool via this absurd mechanism involving the C preprocessor on the
debian-cd side. But cdimage knows exactly which packages to include, so
write a simple file with the list of packages we want (alongside the
current silliness, for now).

	run-tests:0 (build)
	lint:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

diff --git a/lib/cdimage/germinate.py b/lib/cdimage/germinate.py
index 004e2a3..30e445c 100644
--- a/lib/cdimage/germinate.py
+++ b/lib/cdimage/germinate.py
@@ -222,7 +222,11 @@ class GerminateOutput:
         return os.path.join(self.directory, arch, seed)
 
     def seed_packages(self, arch, seed):
-        with open(self.seed_path(arch, seed)) as seed_file:
+        try:
+            seed_file = open(self.seed_path(arch, seed))
+        except FileNotFoundError:
+            return []
+        with seed_file:
             lines = seed_file.read().splitlines()[2:-2]
             return [line.split(None, 1)[0] for line in lines]
 
@@ -241,9 +245,15 @@ class GerminateOutput:
 
     def write_tasks(self):
         output_dir = self.tasks_output_dir()
-        osextras.mkemptydir(self.tasks_output_dir())
+        osextras.mkemptydir(output_dir)
 
         for arch in self.config.arches:
+            arch_packages = set()
+            for seed in self.pool_seeds():
+                arch_packages.update(self.seed_packages(arch, seed))
+            with open(os.path.join(output_dir, f"{arch}-packages"), "w") as fp:
+                for package in sorted(arch_packages):
+                    print(package, file=fp)
             cpparch = arch.replace("+", "_").replace("-", "_")
             for seed in self._seeds:
                 if not os.path.exists(self.seed_path(arch, seed)):
@@ -261,9 +271,13 @@ class GerminateOutput:
     def diff_tasks(self, output=None):
         tasks_dir = self.tasks_output_dir()
         previous_tasks_dir = "%s-previous" % tasks_dir
-        for seed in ["MASTER"] + list(self._seeds):
-            old = os.path.join(previous_tasks_dir, seed)
-            new = os.path.join(tasks_dir, seed)
+        filenames = ["MASTER"] + list(self._seeds)
+        for arch in self.config.arches:
+            filenames.append(f"{arch}-packages")
+
+        for filename in filenames:
+            old = os.path.join(previous_tasks_dir, filename)
+            new = os.path.join(tasks_dir, filename)
             if os.path.exists(old) and os.path.exists(new):
                 kwargs = {}
                 if output is not None:
diff --git a/lib/cdimage/tests/test_germinate.py b/lib/cdimage/tests/test_germinate.py
index 7b15027..ca556af 100644
--- a/lib/cdimage/tests/test_germinate.py
+++ b/lib/cdimage/tests/test_germinate.py
@@ -434,6 +434,7 @@ class TestGerminateOutput(TestCase):
             self.write_seed_output(arch, "minimal", ["adduser-%s" % arch])
             self.write_seed_output(arch, "desktop", ["xterm", "firefox"])
             self.write_seed_output(arch, "live", ["xterm"])
+            self.write_seed_output(arch, "ship-live", ["pool-pkg-%s" % arch])
             with mkfile(os.path.join(
                     seed_dir, "minimal.seedtext")) as seedtext:
                 print("Task-Seeds: required", file=seedtext)
@@ -453,7 +454,8 @@ class TestGerminateOutput(TestCase):
             self.temp_dir, "scratch", "ubuntu", "bionic", "daily-live",
             "tasks")
         self.assertCountEqual([
-            "required", "minimal", "desktop", "live",
+            "required", "minimal", "desktop", "live", "ship-live",
+            "amd64-packages", "i386-packages",
             "MASTER",
         ], os.listdir(output_dir))
         with open(os.path.join(output_dir, "required")) as f:
@@ -504,6 +506,10 @@ class TestGerminateOutput(TestCase):
                 f.read())
         with open(os.path.join(output_dir, "MASTER")) as f:
             self.assertEqual("#include <ubuntu/bionic/ship-live>\n", f.read())
+        with open(os.path.join(output_dir, "amd64-packages")) as f:
+            self.assertEqual("pool-pkg-amd64\n", f.read())
+        with open(os.path.join(output_dir, "i386-packages")) as f:
+            self.assertEqual("pool-pkg-i386\n", f.read())
 
     @mock.patch("subprocess.call", return_value=1)
     def test_diff_tasks(self, mock_call):