]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
release builds should go to pre-staging
authorHolger Levsen <holger@layer-acht.org>
Wed, 15 Feb 2012 13:42:19 +0000 (14:42 +0100)
committerHolger Levsen <holger@layer-acht.org>
Wed, 15 Feb 2012 13:42:19 +0000 (14:42 +0100)
debian_build.py

index 66f49dea5e8076fe22597ac52874fc20901d83db..54ee3d065d7bcfb96ac6c2fb97b74b7b72b6ce9e 100755 (executable)
@@ -420,9 +420,9 @@ if __name__ == '__main__':
 
     if options.distribution in ('experimental'):
       pb_suite=changelog_distro
-    elif options.distribution in ('unstable' , 'pre-staging'):
+    elif GIT_BRANCH_NAME.startswith('release/') or options.distribution in ('unstable' , 'pre-staging'):
       pb_suite='pre-staging'
-    elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/') or options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'):
+    elif GIT_BRANCH_NAME.startswith('hotfix/') or options.distribution in ('stable', 'stable-proposed-updates', 'production', 'production-proposed-updates'):
       pb_suite='production-proposed-updates'
        
     gbp = git_buildpackage.GitBuildPackage(