Merge ~cjwatson/launchpad:remove-old-build-dispatch-arguments into launchpad:master

[Colin Watson]

Remove two old build dispatch arguments

launchpad-buildd 226 stopped using the `distribution` and `distroseries_name` arguments and is now deployed everywhere relevant to us, so we can drop these from the protocol.

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py b/lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py
index d78d9ca..7fdf254 100644
--- a/lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py
+++ b/lib/lp/buildmaster/interfaces/buildfarmjobbehaviour.py
@@ -77,14 +77,6 @@ BuildArgs = TypedDict(
         "channels": Dict[str, str],
         # The date stamp to set in the built image [livefs].
         "datestamp": str,
-        # The name of the distribution to build for [no longer used, but
-        # currently required for binarypackage].
-        "distribution": str,
-        # The name of the series to build for [sourcepackagerecipe].
-        # XXX cjwatson 2017-07-26: This duplicates "series", which is common
-        # to all build types; this name for it is deprecated and should be
-        # removed once launchpad-buildd no longer requires it.
-        "distroseries_name": str,
         # A dictionary of additional environment variables to pass to the CI
         # build runner [ci].
         "environment_variables": Dict[str, str],
diff --git a/lib/lp/code/model/recipebuilder.py b/lib/lp/code/model/recipebuilder.py
index 9b6e49a..5b73659 100644
--- a/lib/lp/code/model/recipebuilder.py
+++ b/lib/lp/code/model/recipebuilder.py
@@ -100,10 +100,6 @@ class RecipeBuildBehaviour(BuildFarmJobBehaviourBase):
             tools_source=config.builddmaster.bzr_builder_sources_list,
             logger=logger,
         )
-        # XXX cjwatson 2017-07-26: This duplicates "series", which is common
-        # to all build types; this name for it is deprecated and should be
-        # removed once launchpad-buildd no longer requires it.
-        args["distroseries_name"] = self.build.distroseries.name
         if self.build.recipe.base_git_repository is not None:
             args["git"] = True
         return args
diff --git a/lib/lp/code/model/tests/test_recipebuilder.py b/lib/lp/code/model/tests/test_recipebuilder.py
index ce34d6f..33481f5 100644
--- a/lib/lp/code/model/tests/test_recipebuilder.py
+++ b/lib/lp/code/model/tests/test_recipebuilder.py
@@ -213,7 +213,6 @@ class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
                 "author_name": "Joe User",
                 "build_url": canonical_url(job.build),
                 "builder_constraints": [],
-                "distroseries_name": job.build.distroseries.name,
                 "fast_cleanup": True,
                 "ogrecomponent": "universe",
                 "recipe_text": "# bzr-builder format 0.3 "
@@ -316,7 +315,6 @@ class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
                 "author_name": "Joe User",
                 "build_url": canonical_url(job.build),
                 "builder_constraints": [],
-                "distroseries_name": job.build.distroseries.name,
                 "fast_cleanup": True,
                 "ogrecomponent": "universe",
                 "recipe_text": "# bzr-builder format 0.3 "
@@ -366,7 +364,6 @@ class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
                 "author_name": "Joe User",
                 "build_url": canonical_url(job.build),
                 "builder_constraints": [],
-                "distroseries_name": job.build.distroseries.name,
                 "fast_cleanup": True,
                 "git": True,
                 "ogrecomponent": "universe",
diff --git a/lib/lp/soyuz/model/binarypackagebuildbehaviour.py b/lib/lp/soyuz/model/binarypackagebuildbehaviour.py
index a038114..4b65e9c 100644
--- a/lib/lp/soyuz/model/binarypackagebuildbehaviour.py
+++ b/lib/lp/soyuz/model/binarypackagebuildbehaviour.py
@@ -163,7 +163,6 @@ class BinaryPackageBuildBehaviour(BuildFarmJobBehaviourBase):
         # Build extra arguments.
         args = yield super().extraBuildArgs(logger=logger)  # type: BuildArgs
         args["arch_indep"] = build.arch_indep
-        args["distribution"] = das.distroseries.distribution.name
         args["suite"] = das.distroseries.getSuite(build.pocket)
 
         archive_purpose = build.archive.purpose
diff --git a/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py b/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
index ea4a2db..073b387 100644
--- a/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
+++ b/lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py
@@ -168,7 +168,6 @@ class TestBinaryBuildPackageBehaviour(StatsMixin, TestCaseWithFactory):
             "build_debug_symbols": archive.build_debug_symbols,
             "build_url": canonical_url(build),
             "builder_constraints": [],
-            "distribution": das.distroseries.distribution.name,
             "fast_cleanup": builder.virtualized,
             "image_type": "chroot",
             "ogrecomponent": component,