]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
provide PB_SUITE
authorHolger Levsen <holger@layer-acht.org>
Wed, 2 Nov 2011 16:02:51 +0000 (17:02 +0100)
committerHolger Levsen <holger@layer-acht.org>
Wed, 2 Nov 2011 16:02:51 +0000 (17:02 +0100)
kernel_build.py
kernel_inpbuilder.py

index f9b939a135772fecf6f630c92a7038f1d94a8ff3..b8b1988d7bbbbfa34d4a2a55f8c11eafb246fbfd 100644 (file)
@@ -39,9 +39,10 @@ PBUILDER = '/usr/sbin/pbuilder'
 SUDO = '/usr/bin/sudo'
 
 env = os.environ
-env['PB_SUITE'] = os.environ.get('DISTRIBUTION')
-if os.environ.get('DISTRIBUTION') == 'production':
-    env['PB_SUITE'] = 'production-proposed-updates'
+PB_SUITE os.environ.get('DISTRIBUTION')
+if PB_SUITE == 'production':
+    PB_SUITE = 'production-proposed-updates'
+env['PB_SUITE'] = PB_SUITE
 
 # FIXME: move this into own logger Class
 logger = logging.getLogger(sys.argv[0])
index dd1386f51465e3a9b034eb6d5758cc5c62f23ff9..9f89e7db47df71cdc26779763f4ffcb83cf8b574 100644 (file)
@@ -387,6 +387,7 @@ if __name__ == '__main__':
     if not GIT_BRANCH_NAME:
         # try to get it from persistence
         try:
+            PB_SUITE = os.environ.get('PB_SUITE')
             kernel_revision_obj = kernel_persistence.get_last_kernel_revision_obj(PB_SUITE)  
             GIT_BRANCH_NAME=kernel_revision_obj.branch
         except: