Merge lp:~fo0bar/ubuntu-cdimage/bittorrent into lp:ubuntu-cdimage

[Ryan Finnie]

Generate torrents with https://{ipv6.,}torrent.ubuntu.com/announce instead of http :6969

Redirects are in place from the old location to the new https -- regeneration of the existing supported releases would be nice but isn't strictly necessary.

=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2019-05-07 18:35:15 +0000
+++ lib/cdimage/tests/test_tree.py	2019-05-19 22:02:51 +0000
@@ -2379,7 +2379,7 @@
         self.assertLogEqual(
             ["Creating torrent for %s ..." % path for path in paths])
         command_base = [
-            "btmakemetafile", "http://torrent.ubuntu.com:6969/announce",
+            "btmakemetafile", "https://torrent.ubuntu.com/announce",
             "--comment", "Ubuntu CD cdimage.ubuntu.com",
         ]
         mock_check_call.assert_has_calls([
@@ -2670,10 +2670,10 @@
         publisher.make_torrents(
             os.path.join(self.temp_dir, "dir"), "ubuntu-13.04")
         command_base = [
-            "btmakemetafile", "http://torrent.ubuntu.com:6969/announce",
+            "btmakemetafile", "https://torrent.ubuntu.com/announce",
             "--announce_list",
-            ("http://torrent.ubuntu.com:6969/announce|"
-                "http://ipv6.torrent.ubuntu.com:6969/announce"),
+            ("https://torrent.ubuntu.com/announce|"
+                "https://ipv6.torrent.ubuntu.com/announce"),
             "--comment", "Ubuntu CD releases.ubuntu.com",
         ]
         mock_check_call.assert_has_calls([
 
=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2019-05-07 18:35:15 +0000
+++ lib/cdimage/tree.py	2019-05-19 22:02:51 +0000
@@ -2878,8 +2878,8 @@
     Releases are always copies of a nominated daily build.
     """
 
-    torrent_tracker = "http://torrent.ubuntu.com:6969/announce"
-    ipv6_torrent_tracker = "http://ipv6.torrent.ubuntu.com:6969/announce"
+    torrent_tracker = "https://torrent.ubuntu.com/announce"
+    ipv6_torrent_tracker = "https://ipv6.torrent.ubuntu.com/announce"
 
     def __init__(self, tree, image_type, official, status=None, dry_run=False):
         super(ReleasePublisher, self).__init__(tree, image_type)