Merge lp:~robru/cupstream2distro/set-ppa-description into lp:cupstream2distro

[Robert Bruce Park]

Set PPA description with silo summary.

[Robert Bruce Park (robru)]

Looks great in staging:

https://launchpad.net/~ci-train-staging-area/+archive/ubuntu/landing-008

review: Approve

[Colin Watson (cjwatson)]

You really ought to set self._ppa = None in load_config as well, otherwise you might get very confused later ...

[Robert Bruce Park (robru)]

Thanks Colin, I don't think it's an issue because ".ppa = ..." is only ever called once in one place, and also the ppa is not something that can change during the life of the SiloState object (the train isn't a long-running process, it starts up with each jenkins job and then exits when done). So it's really a non issue (in fact I should drop the setter entirely, but I'll clean that kind of thing up later)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'cupstream2distro/silomanager.py'
--- cupstream2distro/silomanager.py	2015-08-22 05:04:58 +0000
+++ cupstream2distro/silomanager.py	2015-08-27 15:56:24 +0000
@@ -64,6 +64,26 @@
 TOKEN_SCRUB = re.compile('token=[a-z0-9-]+', flags=re.IGNORECASE)
 
 
+PPA_DESCRIPTION = """\
+Landers: {landers}
+Status: {status}
+Destination: {dest}
+Series: {series} {dual}
+Packages: {packages}
+Merges:
+{merges}
+
+Actions:
+{action_build}
+{action_publish}
+{action_clean}
+
+More info:
+{request_url}
+{status_url}
+"""
+
+
 default_excepthook = sys.excepthook
 
 
@@ -102,6 +122,7 @@
     CONFIG_FILENAME = 'config'
     _config = None
     _configfile = None
+    _ppa = None
 
     @classmethod
     def iterate(cls, ignore=None):
@@ -213,6 +234,27 @@
             self._config = json.load(data)
         self._mtime = self.get_mtime()
 
+    def push_to_ppa_description(self):
+        """Set the Silo PPA description to something meaningful."""
+        joburl = '{}job/{}-{{}}/build'.format(
+            env.JENKINS_URL, self.siloname.replace('/', '-'))
+        self.ppa.description = PPA_DESCRIPTION.format(
+            action_build=joburl.format('1-build'),
+            action_publish=joburl.format('2-publish'),
+            action_clean=joburl.format('3-merge-clean'),
+            dest=self.dest.web_link,
+            dual=self.dual or '',
+            landers=' '.join(self.landers),
+            merges='\n'.join(['\n'.join(urls) for urls in self.mps.values()]),
+            packages=' '.join(self.all_projects),
+            series=self.series.name,
+            status_url=env.BUILD_URL + 'consoleFull',
+            status=self.message,
+            request_url=env.JENKINS_URL.replace('ci-', 'requests.ci-') +
+            '#/ticket/{}'.format(self.requestid)).replace(
+            'api.launchpad.net/devel', 'launchpad.net')
+        self.ppa.lp_save()
+
     def push_to_bileto(self):
         """Submit status information to Bileto."""
         if not BILETO_IP:
@@ -238,6 +280,7 @@
     def save_config(self):
         """Write out the JSON blob."""
         self.push_to_bileto()
+        self.push_to_ppa_description()
         if self._mtime != self.get_mtime():
             prev = SiloState(self.siloname, do_load=False)
             prev._configfile = self.configfile
@@ -468,7 +511,9 @@
     @property
     def ppa(self):
         """Return launchpadlib object representing the silo ppa."""
-        return lp.load(self._config['global']['ppa'])
+        if self._ppa is None:
+            self._ppa = lp.load(self._config['global']['ppa'])
+        return self._ppa
 
     @ppa.setter
     def ppa(self, value):

=== modified file 'tests/unit/test_silomanager.py'
--- tests/unit/test_silomanager.py	2015-08-22 03:51:06 +0000
+++ tests/unit/test_silomanager.py	2015-08-27 15:56:24 +0000
@@ -321,6 +321,18 @@
         self.state._configfile = 'does_not_exist'
         self.assertRaises(IOError, self.state.load_config)
 
+    def test_silostate_push_to_ppa_description(self):
+        """Invoke the correct lplib runes for ppa description setting."""
+        self.state._ppa = Mock()
+        self.state.push_to_ppa_description()
+        self.assertIn(
+            'Landers: mzanetti greyback kgunn',
+            self.state._ppa.description)
+        self.assertNotIn(
+            'https://api.launchpad.net/devel/',
+            self.state._ppa.description)
+        self.state._ppa.lp_save.assert_called_once_with()
+
     @patch('cupstream2distro.silomanager.BILETO_IP', '8.8.8.8')
     @patch('cupstream2distro.silomanager.BILETO_API', 'example.com')
     def test_silostate_push_to_bileto(self):
@@ -373,8 +385,10 @@
         tmp = join(self.tempdir, 'config')
         self.state._configfile = tmp
         self.state._mtime = self.state.get_mtime()
+        self.state.push_to_ppa_description = Mock()
         self.state.push_to_bileto = Mock()
         self.state.save_config()
+        self.state.push_to_ppa_description.assert_called_once_with()
         self.state.push_to_bileto.assert_called_once_with()
         json_idx.assert_called_once_with()
         new_state = SiloState('phony-siloname', do_load=False)
@@ -395,8 +409,10 @@
         tmp = join(self.tempdir, 'config')
         self.state._configfile = tmp
         self.state._mtime = self.state.get_mtime()
+        self.state.push_to_ppa_description = Mock()
         self.state.push_to_bileto = Mock()
         self.state.save_config()
+        self.state.push_to_ppa_description.assert_called_once_with()
         self.state.push_to_bileto.assert_called_once_with()
         time.sleep(0.01)
         self.state.save_config()
@@ -417,8 +433,10 @@
         self.state._configfile = tmp
         self.state._mtime = self.state.get_mtime()
         self.state.message = 'First.'
+        self.state.push_to_ppa_description = Mock()
         self.state.push_to_bileto = Mock()
         self.state.save_config()
+        self.state.push_to_ppa_description.assert_called_once_with()
         self.state.push_to_bileto.assert_called_once_with()
         self.state._mtime = 0
         self.state.message = 'Second.'
@@ -704,8 +722,10 @@
         self.assertGreater(first, 0)
         self.state._configfile = tmp
         self.state._mtime = self.state.get_mtime()
+        self.state.push_to_ppa_description = Mock()
         self.state.push_to_bileto = Mock()
         self.state.save_config()
+        self.state.push_to_ppa_description.assert_called_once_with()
         self.state.push_to_bileto.assert_called_once_with()
         second = self.state.get_mtime()
         self.assertGreater(second, first)