Fixing branch behaviour of deploy webhook

diff --git a/lib/webhooks/__init__.py b/lib/webhooks/__init__.py
index 2710f3fff765a9c0c426027905957f04d11b0c9e..0482d77d190adde5543c3accf2b18d6ed903b625 100644 (file)
--- a/lib/webhooks/__init__.py
+++ b/lib/webhooks/__init__.py
@@ -1,6 +1,6 @@
 #!/bin/env python3
 # -*- coding: utf-8 -*-
 
-__version__ = '1.7.5'
+__version__ = '1.7.6'
 
 # vim: ts=4 et list

diff --git a/lib/webhooks/base_app.py b/lib/webhooks/base_app.py
index dc08e51756cf4312fbe837b38b2aff363cdda637..2511947829fbba9b7d0dffb37fb6d1d8ff9ca2f1 100644 (file)
--- a/lib/webhooks/base_app.py
+++ b/lib/webhooks/base_app.py
@@ -1052,7 +1052,7 @@ class BaseHookApp(BaseApplication):
         if not self.json_data and not self.read_stdin:
             return True
 
-        self.ref = self.json_data['ref'].split('/')[-1]
+        self.ref = '/'.join(self.json_data['ref'].split('/')[2:])
         self.namespace = self.json_data['project']['namespace']
         self.name = self.json_data['project']['name']
         self.full_name = self.json_data['project']['path_with_namespace']

diff --git a/lib/webhooks/deploy.py b/lib/webhooks/deploy.py
index c2b27218e0e039a64a2c298c8abda397b2985259..fca189ff1f2d0e9a57806399685d2d43cd09d3cb 100644 (file)
--- a/lib/webhooks/deploy.py
+++ b/lib/webhooks/deploy.py
@@ -179,6 +179,12 @@ class WebhookDeployApp(BaseHookApp):
                 cfg['name'] = project_key
             full_name = ns + '/' + pname
 
+            if ['branch'] in cfg:
+                if self.ref.lower() != cfg['branch'].lower():
+                    LOG.debug("Wrong branch in working dir {cfb!r} - wanted {hb!r}.".format(
+                        cfb=cfg['branch'], hb=self.ref))
+                    continue
+
             if self.verbose > 1:
                 LOG.debug("Checking for {!r} ...".format(full_name))