]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
trigger with the right git branch name
authorHolger Levsen <holger@layer-acht.org>
Fri, 9 Dec 2011 16:49:48 +0000 (17:49 +0100)
committerHolger Levsen <holger@layer-acht.org>
Fri, 9 Dec 2011 16:49:48 +0000 (17:49 +0100)
.gitignore [new file with mode: 0644]
debian_build.py
kernel_inpbuilder.py

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..9fa524a
--- /dev/null
@@ -0,0 +1 @@
+.*\.swp
index ed6d703997fd4ba229a7f209d0f3a94026ae2e65..8416a854322c9764be183350e95c6ff8c675ad22 100755 (executable)
@@ -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())                    )
index 692f0606f089f6ba051a8f5e65039d4d0e67983f..66905fea507bdbdb8bac661954372843678ba8cd 100644 (file)
@@ -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')