Merge lp:~xubuntu-dev/ubuntu-cdimage/git_seed into lp:ubuntu-cdimage

[Sean Davis]

Xubuntu now uses git seeds, not bzr

This branch migrates the Xubuntu seed from bzr to git

[Steve Langasek (vorlon)]

Also needs corresponding test updates.

$ ./run-tests
[...]
======================================================================
FAIL: test_seed_sources_bzr (cdimage.tests.test_germinate.TestGermination)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/vorlon/devel/canonical/cdimage/lib/cdimage/tests/test_germinate.py", line 113, in test_seed_sources_bzr
    self.assertEqual(sources, self.germination.seed_sources(project))
AssertionError: Lists differ: ['http://bazaar.launchpad.net/~xubuntu-dev/ubun[71 chars]it/'] != ['https://git.launchpad.net/~xubuntu-dev/ubuntu[74 chars]it/']

First differing element 0:
'http://bazaar.launchpad.net/~xubuntu-dev/ubuntu-seeds/'
'https://git.launchpad.net/~xubuntu-dev/ubuntu-seeds/+git/'

- ['http://bazaar.launchpad.net/~xubuntu-dev/ubuntu-seeds/',
? ^^^^^^

+ ['https://git.launchpad.net/~xubuntu-dev/ubuntu-seeds/+git/',
? + ^^^ +++++

   'https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/']

----------------------------------------------------------------------
Ran 580 tests in 15.046s

FAILED (failures=1)

review: Needs Fixing

[lp:~xubuntu-dev/ubuntu-cdimage/git_seed]

1736. By Sean Davis on 2018-05-26

Add cosmic condition for germinate, update tests

[Sean Davis (bluesabre)]

Thanks for reviewing, Steve. I've made the needed changes and tests now run successfully.

review: Needs Resubmitting

[Steve Langasek (vorlon)]

This latest change has reverted the behavior of cdimage to use the bzr branches as authoritative for all releases prior to cosmic, using the git branch only for cosmic and forward. I don't think this is expected, given that you have imported trusty and later into the git repository, and I don't think it's a good idea to maintain such a split.

The intent of my previous review was to ask that the tests be updated to match the otherwise-correct code.

review: Needs Fixing

[lp:~xubuntu-dev/ubuntu-cdimage/git_seed]

1737. By Sean Davis on 2018-05-28

Fix germinate and tests to use gitpattern for xubuntu intrepid and above

[Sean Davis (bluesabre)]

Thanks again Steve. I'm getting a better understanding of how these things relate now. The latest commit should get everything back in order.

review: Needs Resubmitting

=== modified file 'lib/cdimage/germinate.py'
--- lib/cdimage/germinate.py	2018-05-26 07:29:41 +0000
+++ lib/cdimage/germinate.py	2018-05-28 01:24:55 +0000
@@ -83,7 +83,7 @@
                 sources.insert(0, bzrpattern % "mythbuntu-dev")
             elif project == "xubuntu":
                 if series >= "intrepid":
-                    sources.insert(0, bzrpattern % "xubuntu-dev")
+                    sources.insert(0, gitpattern % "xubuntu-dev")
                 else:
                     sources.insert(0, bzrpattern % "ubuntu-core-dev")
             elif project in ("lubuntu", "lubuntu-next"):

=== modified file 'lib/cdimage/tests/test_germinate.py'
--- lib/cdimage/tests/test_germinate.py	2018-05-26 07:29:55 +0000
+++ lib/cdimage/tests/test_germinate.py	2018-05-28 01:24:55 +0000
@@ -91,7 +91,6 @@
              ["ubuntustudio-dev"]),
             ("mythbuntu", "raring", ["mythbuntu-dev"]),
             ("xubuntu", "hardy", ["ubuntu-core-dev"]),
-            ("xubuntu", "intrepid", ["xubuntu-dev"]),
             ("ubuntu-gnome", "raring",
              ["ubuntu-gnome-dev"]),
             ("ubuntu-budgie", "zesty",
@@ -115,6 +114,7 @@
         for project, series, owners in (
             ("ubuntu", "raring", ["ubuntu-core-dev"]),
             ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]),
+            ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]),
         ):
             self.config["DIST"] = series
             sources = [