Merge ~mwhudson/ubuntu-cdimage:germinate-from-mirror-directly into ubuntu-cdimage:main

[Michael Hudson-Doyle]

pass the mirror directly to germinate

The previous code was broken when using a remote mirror and I have no
idea why it was like that. But it dates from 2006 so maybe there was a
reason then.

[Steve Langasek (vorlon)]

review: Approve

diff --git a/lib/cdimage/germinate.py b/lib/cdimage/germinate.py
index 5bd00e6..fe7c4ab 100644
--- a/lib/cdimage/germinate.py
+++ b/lib/cdimage/germinate.py
@@ -19,7 +19,6 @@ from __future__ import print_function
 
 from collections import OrderedDict, defaultdict
 import errno
-import gzip
 import os
 import re
 import shutil
@@ -111,20 +110,6 @@ class Germination:
         else:
             return self.prefer_vcs
 
-    def make_index(self, project, arch, rel_target, rel_paths):
-        target = os.path.join(self.output_dir(project), rel_target)
-        osextras.mkemptydir(os.path.dirname(target))
-        with gzip.GzipFile(target, "wb") as target_file:
-            for rel_path in rel_paths:
-                if os.path.isabs(rel_path):
-                    abs_path = rel_path
-                else:
-                    abs_path = os.path.join(
-                        find_mirror(self.config, arch), rel_path)
-                if os.path.isfile(abs_path):
-                    with gzip.GzipFile(abs_path, "rb") as source_file:
-                        target_file.write(source_file.read())
-
     @property
     def germinate_dists(self):
         if self.config["GERMINATE_DISTS"]:
@@ -162,21 +147,6 @@ class Germination:
     def germinate_arch(self, project, arch):
         cpuarch = arch.split("+")[0]
 
-        for dist in self.germinate_dists:
-            for suffix in (
-                "binary-%s/Packages.gz" % cpuarch,
-                "source/Sources.gz",
-                "debian-installer/binary-%s/Packages.gz" % cpuarch,
-            ):
-                files = [
-                    "dists/%s/%s/%s" % (dist, component, suffix)
-                    for component in self.components]
-                if self.config["LOCAL"]:
-                    files.append(
-                        "%s/dists/%s/local/%s" %
-                        (self.config["LOCALDEBS"], dist, suffix))
-                self.make_index(project, arch, files[0], files)
-
         arch_output_dir = os.path.join(self.output_dir(project), arch)
         osextras.mkemptydir(arch_output_dir)
         if (self.config["GERMINATE_HINTS"] and
@@ -187,7 +157,7 @@ class Germination:
         command = [
             self.germinate_path,
             "--seed-source", ",".join(self.seed_sources(project)),
-            "--mirror", "file://%s/" % self.output_dir(project),
+            "--mirror", find_mirror(project, arch),
             "--seed-dist", self.seed_dist(project),
             "--dist", ",".join(self.germinate_dists),
             "--arch", cpuarch,
diff --git a/lib/cdimage/tests/test_build.py b/lib/cdimage/tests/test_build.py
index 247f9de..8df8a8e 100644
--- a/lib/cdimage/tests/test_build.py
+++ b/lib/cdimage/tests/test_build.py
@@ -1097,7 +1097,7 @@ class TestBuildImageSet(TestCase):
                     return mock.call([
                         germinate_path,
                         "--seed-source", mock.ANY,
-                        "--mirror", "file://%s/" % germinate_output,
+                        "--mirror", "http://ftpmaster.internal/ubuntu/",
                         "--seed-dist", "ubuntu.trusty",
                         "--dist", "trusty,trusty-security,trusty-updates",
                         "--arch", arch,
diff --git a/lib/cdimage/tests/test_germinate.py b/lib/cdimage/tests/test_germinate.py
index fa11aaf..bdfffa2 100644
--- a/lib/cdimage/tests/test_germinate.py
+++ b/lib/cdimage/tests/test_germinate.py
@@ -36,7 +36,6 @@ from cdimage.germinate import (
     GerminateOutput,
     Germination,
     NoMasterSeeds,
-    find_mirror
 )
 from cdimage.mail import text_file_type
 from cdimage.tests.helpers import TestCase, mkfile, touch
@@ -132,35 +131,6 @@ class TestGermination(TestCase):
         self.germination.prefer_vcs = False
         self.assertFalse(self.germination.use_vcs)
 
-    @mock.patch("cdimage.germinate.find_mirror")
-    def test_make_index(self, mock_find_mirror):
-        def side_effect(*args, **kwargs):
-            return os.path.join(args[0].root, "ftp")
-
-        mock_find_mirror.side_effect = side_effect
-        self.config.root = self.use_temp_dir()
-        self.config["DIST"] = "trusty"
-        self.config["IMAGE_TYPE"] = "daily"
-        files = []
-        for component in "main", "restricted", "universe", "multiverse":
-            source_dir = os.path.join(
-                self.temp_dir, "ftp", "dists", "trusty", component, "source")
-            os.makedirs(source_dir)
-            with gzip.GzipFile(
-                    os.path.join(source_dir, "Sources.gz"), "wb") as sources:
-                sources.write(component.encode("UTF-8"))
-                sources.write(b"\n")
-            files.append("dists/trusty/%s/source/Sources.gz" % component)
-        self.germination.make_index("ubuntu", "i386", files[0], files)
-        output_file = os.path.join(
-            self.temp_dir, "scratch", "ubuntu", "trusty", "daily", "germinate",
-            "dists", "trusty", "main", "source", "Sources.gz")
-        self.assertTrue(os.path.exists(output_file))
-        with gzip.GzipFile(output_file, "rb") as output_sources:
-            self.assertEqual(
-                b"main\nrestricted\nuniverse\nmultiverse\n",
-                output_sources.read())
-
     def test_germinate_dists_environment_override(self):
         self.config["GERMINATE_DISTS"] = "sentinel,sentinel-updates"
         self.assertEqual(
@@ -218,35 +188,17 @@ class TestGermination(TestCase):
         self.config["IMAGE_TYPE"] = "daily"
 
         output_dir = "%s/scratch/ubuntu/trusty/daily/germinate" % self.temp_dir
-        expected_files = []
-
-        for dist in "trusty", "trusty-security", "trusty-updates":
-            for suffix in (
-                "binary-amd64/Packages.gz",
-                "source/Sources.gz",
-                "debian-installer/binary-amd64/Packages.gz",
-            ):
-                for component in "main", "restricted":
-                    path = os.path.join(
-                        self.temp_dir, "ftp", "dists", dist, component, suffix)
-                    os.makedirs(os.path.dirname(path))
-                    with gzip.GzipFile(path, "wb"):
-                        pass
-                expected_files.append(
-                    os.path.join(output_dir, "dists", dist, "main", suffix))
 
         def check_call_side_effect(*args, **kwargs):
             touch(os.path.join(output_dir, "amd64+mac", "structure"))
 
         mock_check_call.side_effect = check_call_side_effect
         self.germination.germinate_arch("ubuntu", "amd64+mac")
-        for expected_file in expected_files:
-            self.assertTrue(os.path.exists(expected_file))
         expected_command = [
             germinate_path,
             "--seed-source",
             "https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/",
-            "--mirror", "file://%s/" % output_dir,
+            "--mirror", "http://ftpmaster.internal/ubuntu/",
             "--seed-dist", "ubuntu.trusty",
             "--dist", "trusty,trusty-security,trusty-updates",
             "--arch", "amd64",