Merge lp:~abentley/ci-director/convert-to-gitbranch into lp:ci-director

[Aaron Bentley]

Convert origin/ format to gitbranch format on output.

This branch tweaks the update-outcome script to emit gitbranch: branches.

update-output ignores buildvars.* in favour of Jenkins parameters, so switching from ci-director to github-juju-landed changed the branch names it records.

This branch changes the branch names it emits to juju-reports json. It converts origin/master to gitbranch:master:github.com/juju/juju.

This seems appropriate since writing this data is already an explicit conversion process. It also means that builds such 4729 will be automatically fixed if the reports json is rewritten.

[lp:~abentley/ci-director/convert-to-gitbranch]

190. By Aaron Bentley on 2017-01-18

Fix test name.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'cidirector/tests/test_update_outcome.py'
--- cidirector/tests/test_update_outcome.py	2016-08-29 18:42:59 +0000
+++ cidirector/tests/test_update_outcome.py	2017-01-18 20:29:53 +0000
@@ -725,7 +725,9 @@
                 state.write_json(filename, data)
 
     @staticmethod
-    def get_revision_build_data():
+    def get_revision_build_data(branch=None):
+        if branch is None:
+            branch = 'gitbranch:master:github.com/juju/juju'
         return {
             'build-revision': {'builds': {'32': {
                 'number': 32,
@@ -736,7 +738,7 @@
                     'parameters': [
                         {
                             'name': 'branch',
-                            'value': 'gitbranch:master:github.com/juju/juju',
+                            'value': branch,
                             },
                         {
                             'name': 'revision',
@@ -810,6 +812,12 @@
         mongo_data = OutcomeState.make_mongo_data(32, rb_data, lbs_data, {})
         self.assertEqual(False, mongo_data['tests']['foo']['vote'])
 
+    def test_make_mongo_data_git_branch_name(self):
+        mongo_data = OutcomeState.make_mongo_data(
+                32, self.get_revision_build_data(branch='origin/master'),
+                set(), {'aws': 'foo'})
+        self.assertEqual(self.get_expected_mongo_data(), mongo_data)
+
     @classmethod
     def get_job_json(cls, timestamp=100, duration=200, build_number=1,
                      branch=None):

=== modified file 'cidirector/update_outcome.py'
--- cidirector/update_outcome.py	2016-08-29 19:05:30 +0000
+++ cidirector/update_outcome.py	2017-01-18 20:29:53 +0000
@@ -616,8 +616,11 @@
         judge = BaseResultJudge(job_source)
         result = judge.determine_result()
         started = from_jenkins_timestamp(build_revision['timestamp'])
+        branch = build_revision_params['branch']
+        branch = re.sub('^origin/(.*)$', r'gitbranch:\1:github.com/juju/juju',
+                        branch)
         mongo_data = {
-            'branch': build_revision_params['branch'],
+            'branch': branch,
             'build': {'last_build': revision_build},
             'complete_failure_info': dict(result.voting_failures),
             'cloud-health': {'substrates': substrates_health},