Merge lp:~timo-jyrinki/cupstream2distro/more_vivid into lp:cupstream2distro

[Timo Jyrinki]

Add more vivid support, make vivid the default in some places.

This MP motivated by the error at https://ci-train.ubuntu.com/job/ubuntu-landing-004-1-build/84/console although I realize this may not be the (full) fix for that.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:790
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/239/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/239/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

lgtm, let's get this in production and see what happens.

review: Approve

=== modified file 'citrain/jenkins-templates/upgrade-chroot.xml.tmpl'
--- citrain/jenkins-templates/upgrade-chroot.xml.tmpl	2014-09-28 06:07:48 +0000
+++ citrain/jenkins-templates/upgrade-chroot.xml.tmpl	2014-10-27 13:11:08 +0000
@@ -9,7 +9,7 @@
         <hudson.model.StringParameterDefinition>
           <name>distributions</name>
           <description>These must correspond to the available set of cowbuilder chroots.</description>
-          <defaultValue>trusty utopic</defaultValue>
+          <defaultValue>trusty utopic vivid</defaultValue>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>

=== modified file 'citrain/prepare_silo.py'
--- citrain/prepare_silo.py	2014-10-23 19:30:05 +0000
+++ citrain/prepare_silo.py	2014-10-27 13:11:08 +0000
@@ -232,7 +232,7 @@
                     source_distro,
                     source_landing))
             source_series = (
-                "utopic" if env.DISTRIBUTION == "ubuntu-rtm" else
+                "vivid" if env.DISTRIBUTION == "ubuntu-rtm" else
                 "14.09")
 
             logging.info(

=== modified file 'tests/data/landing-123/config'
--- tests/data/landing-123/config	2014-09-25 01:16:41 +0000
+++ tests/data/landing-123/config	2014-10-27 13:11:08 +0000
@@ -2,7 +2,7 @@
     "global": {
         "dest": "https://api.launchpad.net/devel/ubuntu/+archive/primary",
         "ppa": "https://api.launchpad.net/devel/~ci-train-ppa-service/+archive/ubuntu/landing-123",
-        "series": "https://api.launchpad.net/devel/ubuntu/utopic",
+        "series": "https://api.launchpad.net/devel/ubuntu/vivid",
         "status": {
             "message": "Packages built",
             "ping": true,

=== modified file 'tests/unit/test_silomanager.py'
--- tests/unit/test_silomanager.py	2014-10-13 12:27:17 +0000
+++ tests/unit/test_silomanager.py	2014-10-27 13:11:08 +0000
@@ -20,8 +20,8 @@
 
 
 class series:
-    name = 'utopic'
-    self_link = 'https://api.launchpad.net/devel/ubuntu/utopic'
+    name = 'vivid'
+    self_link = 'https://api.launchpad.net/devel/ubuntu/vivid'
 
 
 class SiloManagerTestCase(DirectoryAwareTestCase):
@@ -51,7 +51,7 @@
     def test_silostate_is_project_unique(self):
         self.assertFalse(SiloState.is_project_unique(dest, series, 'qtmir'))
         self.assertTrue(SiloState.is_project_unique(dest, series, 'fubar'))
-        series.self_link = 'not utopic'
+        series.self_link = 'not vivid'
         self.assertTrue(SiloState.is_project_unique(dest, series, 'qtmir'))
 
     @patch('cupstream2distro.silomanager.SiloState.requestid', '1234')
@@ -69,7 +69,7 @@
         initMock.return_value = None
         silo_state = SiloState.find_by_requestid('1234')
         initMock.assert_called_with('ubuntu-rtm/landing-030')
-        # 30 utopic silos, 30 RTM silos, plus the 2 preprod silos.
+        # 30 vivid silos, 30 RTM silos, plus the 2 preprod silos.
         self.assertEqual(initMock.call_count, 62)
         self.assertIsNone(silo_state)
 
@@ -352,7 +352,7 @@
             'ubuntu/landing-123')
         self.assertEqual(
             self.state.series,
-            'https://api.launchpad.net/devel/ubuntu/utopic')
+            'https://api.launchpad.net/devel/ubuntu/vivid')
         self.assertEqual(self.state.state, 3)
         self.assertEqual(self.state.landers, ['mzanetti', 'greyback', 'kgunn'])
         self.assertEqual(self.state.requestid, '1411123362781')
@@ -384,8 +384,8 @@
         self.assertTrue(self.state._config['source_sync_all_contents'])
         self.state.source_archive = 'ubuntu'
         self.assertEqual(self.state._config['source_archive'], 'ubuntu')
-        self.state.source_series = 'utopic'
-        self.assertEqual(self.state._config['source_series'], 'utopic')
+        self.state.source_series = 'vivid'
+        self.assertEqual(self.state._config['source_series'], 'vivid')
         self.state.state = 'snicker'
         self.state.sources = ['foo', 'bar']
         self.assertEqual(self.state._config['sources'], ['foo', 'bar'])