← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~xnox/launchpad-buildd/drop-removed-ltsp-server into lp:launchpad-buildd

 

Dimitri John Ledkov has proposed merging lp:~xnox/launchpad-buildd/drop-removed-ltsp-server into lp:launchpad-buildd.

Commit message:
Stop installing ltsp-server for i386 livefs-builders. Edubuntu product that used that is long dead, and the package itself is now removed from focal.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~xnox/launchpad-buildd/drop-removed-ltsp-server/+merge/376865

Stop installing ltsp-server for i386 livefs-builders. Edubuntu product that used that is long dead, and the package itself is now removed from focal.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~xnox/launchpad-buildd/drop-removed-ltsp-server into lp:launchpad-buildd.
=== modified file 'debian/changelog'
--- debian/changelog	2019-12-12 13:04:05 +0000
+++ debian/changelog	2019-12-16 19:25:06 +0000
@@ -1,3 +1,11 @@
+launchpad-buildd (185) UNRELEASED; urgency=medium
+
+  * Stop installing ltsp-server for i386 livefs-builders. Edubuntu product
+    that used that is long dead, and the package itself is now removed
+    from focal.
+
+ -- Dimitri John Ledkov <xnox@xxxxxxxxxx>  Mon, 16 Dec 2019 19:22:41 +0000
+
 launchpad-buildd (184) xenial; urgency=medium
 
   * Adjust sbuildrc to handle various changes in bionic's sbuild.

=== modified file 'lpbuildd/target/build_livefs.py'
--- lpbuildd/target/build_livefs.py	2019-10-02 10:30:04 +0000
+++ lpbuildd/target/build_livefs.py	2019-12-16 19:25:06 +0000
@@ -100,11 +100,6 @@
         self.backend.run(["apt-get", "-y", "install"] + deps)
         if self.args.backend in ("lxd", "fake"):
             self.snap_store_set_proxy()
-        if self.args.arch == "i386":
-            self.backend.run([
-                "apt-get", "-y", "--no-install-recommends", "install",
-                "ltsp-server",
-                ])
         if self.args.locale is not None:
             self.backend.run([
                 "apt-get", "-y", "--install-recommends", "install",

=== modified file 'lpbuildd/target/tests/test_build_livefs.py'
--- lpbuildd/target/tests/test_build_livefs.py	2019-10-02 10:30:04 +0000
+++ lpbuildd/target/tests/test_build_livefs.py	2019-12-16 19:25:06 +0000
@@ -94,18 +94,6 @@
             RanAptGet("install", "livecd-rootfs"),
             ]))
 
-    def test_install_i386(self):
-        args = [
-            "buildlivefs",
-            "--backend=fake", "--series=xenial", "--arch=i386", "1",
-            ]
-        build_livefs = parse_args(args=args).operation
-        build_livefs.install()
-        self.assertThat(build_livefs.backend.run.calls, MatchesListwise([
-            RanAptGet("install", "livecd-rootfs"),
-            RanAptGet("--no-install-recommends", "install", "ltsp-server"),
-            ]))
-
     def test_install_locale(self):
         args = [
             "buildlivefs",