Merge pull request #3328 from s0undt3ch/master

Include white-listed event payload properties for GitHub push events

master/buildbot/changes/github.py

@@ -42,7 +42,7 @@
 
 
 class PullRequestMixin(object):
-    def extractProperties(self, pr_info):
+    def extractProperties(self, payload):
         def flatten(properties, base, info_dict):
             for k, v in iteritems(info_dict):
                 name = ".".join([base, k])
@@ -53,7 +53,7 @@ def flatten(properties, base, info_dict):
                     properties[name] = v
 
         properties = {}
-        flatten(properties, "github", pr_info)
+        flatten(properties, "github", payload)
         return properties
 
 

master/buildbot/newsfragments/hooks-github-push-event-include-whilelisted-properties.feature

@@ -0,0 +1 @@
+The :py:class:`~buildbot.www.hooks.github.GitHubEventHandler` now allows the inclusion of white-listed properties for push events.

master/buildbot/www/hooks/github.py

@@ -119,8 +119,10 @@ def handle_push(self, payload, event):
         # project = request.args.get('project', [''])[0]
         project = payload['repository']['full_name']
 
+        # Inject some additional white-listed event payload properties
+        properties = self.extractProperties(payload)
         changes = self._process_change(payload, user, repo, repo_url, project,
-                                       event)
+                                       event, properties)
 
         log.msg("Received {} changes from github".format(len(changes)))
 
@@ -170,7 +172,8 @@ def handle_pull_request(self, payload, event):
             len(changes), number))
         return changes, 'git'
 
-    def _process_change(self, payload, user, repo, repo_url, project, event):
+    def _process_change(self, payload, user, repo, repo_url, project, event,
+                        properties):
         """
         Consumes the JSON as a python object and actually starts the build.
 
@@ -218,6 +221,8 @@ def _process_change(self, payload, user, repo, repo_url, project, event):
                     'event': event,
                 },
             }
+            # Update with any white-listed github event properties
+            change['properties'].update(properties)
 
             if callable(self._codebase):
                 change['codebase'] = self._codebase(payload)