]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
move back variables which are not that common as I thought (provided through jenkins...
authorMathias Klette <mathias.klette@profitbricks.com>
Tue, 30 Apr 2013 17:06:46 +0000 (19:06 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Tue, 30 Apr 2013 17:06:46 +0000 (19:06 +0200)
common_code.py
debian_build.py

index 891011398c26fa18379b20ba0df93715b79cb446..dc4e7d33e6979930c54abc342623e33a1f389e11 100755 (executable)
@@ -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']
index 44b9f5a825ef6f0be3fc31fe6e8e9751bf9d4a4c..3ba67cfedbb4928ebdf551b11d8ff78c7b4ad5fb 100755 (executable)
@@ -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 = (