From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Tue, 28 May 2013 16:07:57 +0000 (+0200)
Subject: debian_build: do not merge if we are on integration already
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=b1cbd6e7a320c226ce187bf7a94e38edf842645b;p=profitbricks%2Fjenkins-build-scripts.git

debian_build: do not merge if we are on integration already
---

diff --git a/debian_build.py b/debian_build.py
index ba13a65..754ce52 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -333,7 +333,7 @@ if __name__ == '__main__':
     # .. do some CI magic now, if requested
     if do_triggers:
 
-        if 'merge' in commit_triggers:
+        if 'merge' in commit_triggers and local_branch != 'integration':
             if 'no-test' in commit_triggers:
                 logger.info('Force building with tests as we also merge your branch.')
                 commit_triggers.remove('no-test')