]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
remove check
authorHolger Levsen <holger@layer-acht.org>
Thu, 20 Sep 2012 11:28:56 +0000 (13:28 +0200)
committerHolger Levsen <holger@layer-acht.org>
Thu, 20 Sep 2012 11:28:56 +0000 (13:28 +0200)
debian_build.py

index dd7f697949ea88064b12df2d63b82b0cd605a454..13238f4db2bd104d2d6f3cf1f33cc0946664cd79 100755 (executable)
@@ -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))