From 5ff66e3b026d0e9fdeffba70bf95e690995e9932 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 16 Oct 2012 15:58:03 +0200 Subject: [PATCH] only trigger liveboots automatically for builds from master+hotfix/* branches --- debian_build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian_build.py b/debian_build.py index ece00ad..a026b4d 100755 --- a/debian_build.py +++ b/debian_build.py @@ -568,7 +568,6 @@ if __name__ == '__main__': logger.exception(error) exit_error() BUILD_END = datetime.datetime.now() - # FIXME: must not add development builds... or maybe? # cidb wise, we only care about builds from master, hotfix + develop package_instances=[] if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME == 'develop' or GIT_BRANCH_NAME.startswith('hotfix/'): @@ -579,7 +578,8 @@ if __name__ == '__main__': subprocess.check_call(cmd) logger.error("package instance not added to DB") exit_error() - if len(package_instances) > 0: + # only trigger liveboots automatically for builds from master+hotfix/* branches + if len(package_instances) > 0 and ( GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/')): try: add_liveboot_request(package_instances) except: -- 2.39.5