]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
debian_build.py: Use a main function.
authorBenjamin Drung <benjamin.drung@profitbricks.com>
Tue, 26 Aug 2014 09:50:14 +0000 (11:50 +0200)
committerBenjamin Drung <benjamin.drung@profitbricks.com>
Tue, 26 Aug 2014 09:50:14 +0000 (11:50 +0200)
debian_build.py

index f1828e59ea92986f4fa4c7a9c9dbb8e3566f1f39..fc13a0cc0a2bfa8e4d0c5303886eb3302558454d 100755 (executable)
@@ -28,9 +28,6 @@ from lib import gitpkg
 from lib import sbuild
 
 
-# from common_code
-logger = logger_init(re.match('^(.*/jenkins_build_script/)(.*)', __file__).groups()[1])
-
 # jenkins environment - parameters
 ENV.setdefault('NO_UPLOAD', '')
 ENV.setdefault('BUILD_TRIGGERS', '')
@@ -43,8 +40,6 @@ if ENV['GIT_BRANCH'] != ENV['GIT_BRANCH_NAME']:
 #GIT_REPO_PATH = ENV['GIT_REPO_PATH']
 
 # local constants
-BUILD_START = datetime.datetime.now()
-
 SUPPORTED_DISTRIBUTIONS = ('squeeze', 'wheezy', 'jessie')
 
 DISTRO_SUFFIX = {
@@ -206,7 +201,9 @@ def escape_arg(arg):
     return '"%s"' % arg.replace('\\', r'\\').replace('"', r'\"')
 
 
-if __name__ == '__main__':
+def main():
+    build_start = datetime.datetime.now()
+    logger = logger_init(re.match('^(.*/jenkins_build_script/)(.*)', __file__).groups()[1])
     logger.debug('Start-up environment:\n\n{env}\n'.format(env=pformat(ENV)))
 
     # Act I: prepare variables
@@ -249,7 +246,7 @@ if __name__ == '__main__':
     logger.info('Repository Name: %s' % repo_name)
 
     # .. some local variables
-    daily_date = BUILD_START.strftime('%Y%m%d%H%M%S')
+    daily_date = build_start.strftime('%Y%m%d%H%M%S')
     local_branch = re.match('^(origin/)?(.*)', ENV['GIT_BRANCH']).groups()[1]
     remote_branch = os.path.join('origin', local_branch)
 
@@ -805,7 +802,7 @@ if __name__ == '__main__':
             figlet('Legacy upload failed')
 
     # .. define the time of completion
-    BUILD_END = datetime.datetime.now()
+    build_end = datetime.datetime.now()
 
     # .. and add all the records to CIDB
     if not do_cidb:
@@ -822,8 +819,8 @@ if __name__ == '__main__':
                 ENV['BUILD_NUMBER'],
                 os.path.abspath(changes_file),
                 new_version,
-                BUILD_START,
-                BUILD_END,
+                build_start,
+                build_end,
                 git_repo_name,
                 ENV['GIT_URL'],
                 ENV['GIT_COMMIT']
@@ -854,3 +851,6 @@ if __name__ == '__main__':
     logger.info('-' * 99)
     figlet('Success!!!')
     exit_ok()
+
+if __name__ == '__main__':
+    main()