From d72c239e211dd22b3939f002c027a1dab3ee7778 Mon Sep 17 00:00:00 2001 From: Mathias Klette Date: Wed, 29 May 2013 15:46:19 +0200 Subject: [PATCH] debian_build: push the merged feature/-branch to integration upon successful build --- debian_build.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/debian_build.py b/debian_build.py index 754ce52..4f88661 100755 --- a/debian_build.py +++ b/debian_build.py @@ -106,6 +106,7 @@ if __name__ == '__main__': do_cidb = False do_cleanup = True do_liveboot_request = False + do_push = False do_reports = True do_tagging = False do_triggers = False @@ -349,6 +350,10 @@ if __name__ == '__main__': dst_branch=dst_branch, src_branch=src_branch, )) + # if this rebased/merged branch builds successful, push changes to + # integration branch and let this branch rebuild and finally tag the + # commit + do_push = True if 'no-test' in commit_triggers: # debian/rules from vdc-bundles determines maven options for tests @@ -483,6 +488,17 @@ if __name__ == '__main__': except: pass + # .. push the auto-merged branch into integration: + if do_push: + try: + gitrepo.git.push('origin', 'integration:integration') + logger.info('Check "integration-*"-job for the follow-up build.') + figlet('Push OK') + except Exception as error: + logger.error('Could not push to "integration": ', exc_info=error) + figlet('Push failed') + exit_error() + # .. let's tag if not do_tagging: figlet('Tagging skipped') -- 2.39.5