From: Holger Levsen <holger@layer-acht.org>
Date: Sun, 22 Apr 2012 17:47:38 +0000 (+0200)
Subject: make release/* branches trigger builds in+for staging
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=27aac756ad2e1fc97fb985186a3770355f1e741e;p=profitbricks%2Fjenkins-build-scripts.git

make release/* branches trigger builds in+for staging
---

diff --git a/debian_build.py b/debian_build.py
index 6ad5d08..e6e5040 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -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])