From: Mathias Klette Date: Tue, 30 Apr 2013 14:15:25 +0000 (+0200) Subject: remove unintended indentation, import datetime module for BUILD_START variable X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3fdfabc8a3b1d038aab0ef9df87b79543a2c0691;p=profitbricks%2Fjenkins-build-scripts.git remove unintended indentation, import datetime module for BUILD_START variable --- diff --git a/common_code.py b/common_code.py index 9e5c26d..cc85d8c 100755 --- a/common_code.py +++ b/common_code.py @@ -1,6 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +import datetime import logging import os import platform diff --git a/debian_build.py b/debian_build.py index f635260..44b9f5a 100755 --- a/debian_build.py +++ b/debian_build.py @@ -39,50 +39,50 @@ from multiprocessing import cpu_count from ConfigParser import SafeConfigParser # from common_code - logger = logger_init() +logger = logger_init() # local constants - DEFAULT_PARALLEL_JOBS = cpu_count() + 1 - JOB_URL = 'http://jenkins:80/job/%(flavour)s/buildWithParameters?token=BuildIt&' - JOB_DELAY = '0sec' - - #unused: (except in in-active code) - GIT_TARGET_WORKSPACE = os.path.join( - CWD, - ('%s-build%s' %(BUILD_ID, BUILD_NUMBER)), - ) - #unused: (except in in-active code) - GIT_TARGET_DIR = os.path.join( - GIT_TARGET_WORKSPACE, - os.path.basename(GIT_REPO_PATH) - ) - - DPUT_OPTIONS_DEFAULT = { - 'fqdn': 'alexandria.pb.local', - 'method': 'scp', - 'login': 'reprepro', - 'incoming': '/srv/profitbricks-repository/incoming/profitbricks', - 'allow_unsigned_uploads': 1, - 'post_upload_command': 'ssh reprepro@alexandria.pb.local /srv/profitbricks-repository/bin/pb_processincoming', - } - DPUT_OPTIONS_DEV = { - 'fqdn': 'alexandria.pb.local', - 'method': 'scp', - 'login': 'reprepro', - 'incoming': '/srv/dev-repository/incoming/', - 'allow_unsigned_uploads': 1, - 'post_upload_command': 'ssh reprepro@alexandria.pb.local /srv/dev-repository/bin/pb_processincoming', - } - DPUT_CF = os.path.join(CWD, '..', 'dput.cf') - - NO_UPLOAD = ENV['NO_UPLOAD'] - - AUTO_CHANGELOG_JOBS = ( - 'ri-docs', - 'so-docs', - 'infrastructure-docs', - 'storage-docs', - ) +DEFAULT_PARALLEL_JOBS = cpu_count() + 1 +JOB_URL = 'http://jenkins:80/job/%(flavour)s/buildWithParameters?token=BuildIt&' +JOB_DELAY = '0sec' + +#unused: (except in in-active code) +GIT_TARGET_WORKSPACE = os.path.join( + CWD, + ('%s-build%s' %(BUILD_ID, BUILD_NUMBER)), + ) +#unused: (except in in-active code) +GIT_TARGET_DIR = os.path.join( + GIT_TARGET_WORKSPACE, + os.path.basename(GIT_REPO_PATH) + ) + +DPUT_OPTIONS_DEFAULT = { + 'fqdn': 'alexandria.pb.local', + 'method': 'scp', + 'login': 'reprepro', + 'incoming': '/srv/profitbricks-repository/incoming/profitbricks', + 'allow_unsigned_uploads': 1, + 'post_upload_command': 'ssh reprepro@alexandria.pb.local /srv/profitbricks-repository/bin/pb_processincoming', + } +DPUT_OPTIONS_DEV = { + 'fqdn': 'alexandria.pb.local', + 'method': 'scp', + 'login': 'reprepro', + 'incoming': '/srv/dev-repository/incoming/', + 'allow_unsigned_uploads': 1, + 'post_upload_command': 'ssh reprepro@alexandria.pb.local /srv/dev-repository/bin/pb_processincoming', + } +DPUT_CF = os.path.join(CWD, '..', 'dput.cf') + +NO_UPLOAD = ENV['NO_UPLOAD'] + +AUTO_CHANGELOG_JOBS = ( + 'ri-docs', + 'so-docs', + 'infrastructure-docs', + 'storage-docs', + ) class HudsonUrl(urllib.FancyURLopener): pass