]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
the first seven chars should be enough
authorHolger Levsen <holger@layer-acht.org>
Fri, 27 Jan 2012 15:15:03 +0000 (16:15 +0100)
committerHolger Levsen <holger@layer-acht.org>
Fri, 27 Jan 2012 15:15:03 +0000 (16:15 +0100)
debian_build.py

index 211d143adf6cd2ecefbb793967e1e02469f44c27..8a819b859857d09a83148d632a002edb6e22a2ba 100755 (executable)
@@ -355,13 +355,13 @@ if __name__ == '__main__':
        current_commit = git_helper.git_get_commit_id()
 
         if GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'):
-            version = '%s~rc%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit)
+            version = '%s~rc%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
         elif GIT_BRANCH_NAME.startswith('feature/') or GIT_BRANCH_NAME.startswith('poc/') or GIT_BRANCH_NAME.startswith('bugfix/')  or options.distribution == 'experimental':
-            version = '%s~experimental%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit)
+            version = '%s~experimental%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
             # these uploads should go to a different repo:
             DPUT_OPTIONS = DPUT_OPTIONS_DEV
         else:
-            version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit)
+            version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
 
         new_log = 'Generated by jenkins build of %s' % current_commit