]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
make release/* branches trigger builds in+for staging
authorHolger Levsen <holger@layer-acht.org>
Sun, 22 Apr 2012 17:47:38 +0000 (19:47 +0200)
committerHolger Levsen <holger@layer-acht.org>
Sun, 22 Apr 2012 17:47:38 +0000 (19:47 +0200)
debian_build.py

index 6ad5d084b11204548b84ba0debbef059b75d6994..e6e50406e42a96d6d52c7f620e1d5f89ffc08af4 100755 (executable)
@@ -205,7 +205,7 @@ def getopts():
     parser.add_option(
             '--distribution',
             dest='distribution',
-            choices = ['stable', 'production', 'production-proposed-updates', 'unstable', 'pre-staging', 'experimental'],
+            choices = ['stable', 'production', 'production-proposed-updates', 'unstable', 'pre-staging', 'staging', 'experimental'],
             default='unstable',
             help='The pkg distribution. Default: %default'
     )
@@ -343,7 +343,7 @@ if __name__ == '__main__':
     if GIT_BRANCH_NAME == 'develop' or GIT_BRANCH_NAME == 'pre-staging' or GIT_BRANCH_NAME.startswith('feature/') or GIT_BRANCH_NAME.startswith('poc/') or GIT_BRANCH_NAME.startswith('bugfix/') or GIT_BRANCH_NAME.startswith('release/'):
         daily_date = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
         if GIT_BRANCH_NAME.startswith('release/'):
-            changelog_distro = 'production-proposed-updates'
+            changelog_distro = 'staging'
             # use shorter date because we can
             daily_date = datetime.datetime.now().strftime('%Y%m%d')
             version = '%s~rc%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])