From: Mathias Klette Date: Tue, 30 Apr 2013 17:06:46 +0000 (+0200) Subject: move back variables which are not that common as I thought (provided through jenkins... X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f380f14d82241bc6370ba56e1ffcb90cc15c6a78;p=profitbricks%2Fjenkins-build-scripts.git move back variables which are not that common as I thought (provided through jenkins job parameters) --- diff --git a/common_code.py b/common_code.py index 8910113..dc4e7d3 100755 --- a/common_code.py +++ b/common_code.py @@ -41,9 +41,6 @@ def exit_error(): ENV = os.environ ENV.setdefault('ARGV',' '.join(sys.argv)) -ENV.setdefault('NO_UPLOAD','') -ENV.setdefault('GIT_REPO_PATH','') # find out without need of Jenkins parameters -ENV.setdefault('GIT_BRANCH_NAME',ENV['GIT_BRANCH']) BIN_GIT = '/usr/bin/git' BIN_RM = '/bin/rm' @@ -65,7 +62,3 @@ BUILD_URL = ENV['BUILD_URL'] CWD = ENV['WORKSPACE'] -GIT_REPO_PATH = ENV['GIT_REPO_PATH'] -GIT_REPO_NAME = os.path.basename(ENV['GIT_REPO_PATH']) -GIT_BRANCH_NAME = ENV['GIT_BRANCH_NAME'] -GIT_COMMITTER_EMAIL = ENV['GIT_COMMITTER_EMAIL'] diff --git a/debian_build.py b/debian_build.py index 44b9f5a..3ba67cf 100755 --- a/debian_build.py +++ b/debian_build.py @@ -75,6 +75,12 @@ DPUT_OPTIONS_DEV = { } DPUT_CF = os.path.join(CWD, '..', 'dput.cf') +GIT_REPO_PATH = ENV['GIT_REPO_PATH'] +GIT_REPO_NAME = os.path.basename(ENV['GIT_REPO_PATH']) +GIT_BRANCH_NAME = ENV['GIT_BRANCH_NAME'] +GIT_COMMITTER_EMAIL = ENV['GIT_COMMITTER_EMAIL'] + +ENV.setdefault('NO_UPLOAD','') NO_UPLOAD = ENV['NO_UPLOAD'] AUTO_CHANGELOG_JOBS = (