]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
add ~alpha to builds from experiemental and fix bug preventing ~rc to be added to...
authorHolger Levsen <holger@layer-acht.org>
Wed, 18 Jan 2012 15:24:46 +0000 (16:24 +0100)
committerHolger Levsen <holger@layer-acht.org>
Wed, 18 Jan 2012 15:24:46 +0000 (16:24 +0100)
debian_build.py

index 14f3d0b1b02eee980b398c7b7d8b34b0a779bb62..dc4b7091d4c32041c739723d81c6bfdc25e19076 100755 (executable)
@@ -338,11 +338,13 @@ if __name__ == '__main__':
         )
         exit_error()
 
-    if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental'):
+    if options.distribution in ('testing', 'staging', 'unstable', 'pre-staging','experimental') or GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'):
         daily_date = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
 
         if GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'):
             version = '%s~rc%s' %(version, daily_date)
+        elif options.distribution.startswith('feature') or options.distribution == 'experimental':
+            version = '%s~alpha%s' %(version, daily_date)
         else:
             version = '%s~develop%s' %(version, daily_date)