From: Holger Levsen Date: Thu, 20 Sep 2012 11:28:56 +0000 (+0200) Subject: remove check X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=4a10cce2f3c04af879c4ef55baf4119e4755334f;p=profitbricks%2Fjenkins-build-scripts.git remove check --- diff --git a/debian_build.py b/debian_build.py index dd7f697..13238f4 100755 --- a/debian_build.py +++ b/debian_build.py @@ -148,6 +148,8 @@ def add_package_instance(origin, job_name, job_id, changes_file, version): # add deb_package (if not exist) # add deb_package_instance # must not add development builds... or maybe? + # cidb wise, we only care about builds from master + #if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/'): def dput_package_upload(changes_path): try: @@ -602,9 +604,7 @@ if __name__ == '__main__': # upload (if NO_UPLOAD is not set) if NO_UPLOAD not in ('true', 'True'): dput_package_upload(changes_file) - # cidb wise, we only care about builds from master - if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/'): - add_package_instance("profitbricks", BUILD_JOBNAME, BUILD_NUMBER, changes_file, version) + add_package_instance("profitbricks", BUILD_JOBNAME, BUILD_NUMBER, changes_file, version) else: logger.debug('value of NO_UPLOAD: %s' % NO_UPLOAD) logger.info('dist: %s' %(pb_suite))