]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
add preliminary support for building experimental branches
authorHolger Levsen <holger@layer-acht.org>
Wed, 1 Feb 2012 14:32:54 +0000 (15:32 +0100)
committerHolger Levsen <holger@layer-acht.org>
Wed, 1 Feb 2012 14:32:54 +0000 (15:32 +0100)
kernel_inpbuilder.py

index 66905fea507bdbdb8bac661954372843678ba8cd..40de66b92b31a3d1f226646b914aa4c0954bc6f3 100644 (file)
@@ -264,8 +264,10 @@ def determine_kernel_flavour():
     # slightly different version numbers per branch
     if GIT_BRANCH_NAME == 'master':
         debian_version = '$(version)-%s+%s' % (pb_version, REVISION)
-    elif GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'):
+    elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix'):
         debian_version = '$(version)-%s~rc%s' % (pb_version, REVISION)
+    elif GIT_BRANCH_NAME == 'experimental':
+        debian_version = '$(version)-%s~experimental%s' % (pb_version, REVISION)
     else:
         debian_version = '$(version)-%s~develop%s' % (pb_version, REVISION)
 
@@ -448,10 +450,10 @@ if __name__ == '__main__':
 
     logger.info('FTP Login on %s successful' %(ftp.host))
 
-    if GIT_BRANCH_NAME == 'master':
+    if GIT_BRANCH_NAME == 'master' or GIT_BRANCH_NAME.startswith('hotfix/'):
         ftp.cwd('production-proposed-updates')
-    elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'):
-        ftp.cwd('staging');
+    elif GIT_BRANCH_NAME == 'experimental':
+        ftp.cwd('experimental');
     else:
         ftp.cwd('pre-staging');
     logger.info('FTP working directory: %s' %(ftp.pwd()))