From 4f04b14771fe8a20bed11c3f15d2351770aeb795 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 9 Dec 2011 17:49:48 +0100 Subject: [PATCH] trigger with the right git branch name --- .gitignore | 1 + debian_build.py | 3 ++- kernel_inpbuilder.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9fa524a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.*\.swp diff --git a/debian_build.py b/debian_build.py index ed6d703..8416a85 100755 --- a/debian_build.py +++ b/debian_build.py @@ -461,6 +461,7 @@ if __name__ == '__main__': data = urllib.urlencode( ( ('GIT_REPO_PATH', LINUX_FLAVOUR_REPO_PATH), + ('GIT_BRANCH_NAME', GIT_BRANCH_NAME), ('DISTRIBUTION', pb_suite), ('delay', JOB_DELAY) ) @@ -468,7 +469,7 @@ if __name__ == '__main__': ret = url.open(JOB_URL %(urlencode_expansion_dict) + '%s' %(data)) if ret.code == 200: - logger.info('jenkins url called successfully.') + logger.info('jenkins url %s called successfully. ' JOB_URL %(urlencode_expansion_dict) + '%s' %(data)) else: logger.info('URL was %s' % JOB_URL %(urlencode_expansion_dict) + '%s' %(data)) logger.info('jenkins sends the following: %s' %(ret.read()) ) diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index 692f060..66905fe 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -454,6 +454,7 @@ if __name__ == '__main__': ftp.cwd('staging'); else: ftp.cwd('pre-staging'); + logger.info('FTP working directory: %s' %(ftp.pwd())) for package in glob( os.path.join(GIT_TARGET_WORKSPACE, '*.deb') -- 2.39.5