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