Merge lp:~afrantzis/jenkins-launchpad-plugin/deb-artifacts-in-any-dir into lp:jenkins-launchpad-plugin

[Alexandros Frantzis]

Be more versatile when looking for deb artifacts

Don't depend on the deb artifacts being in the 'work/output' directory

Be more versatile when looking for deb artifacts

Don't depend on the deb artifacts being in the 'work/output' directory

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:132
http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-trusty-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-trusty-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/jenkins-launchpad-plugin-ci/51/rebuild

review: Approve (continuous-integration)

[lp:~afrantzis/jenkins-launchpad-plugin/deb-artifacts-in-any-dir]

133. By Alexandros Frantzis on 2016-02-02

Sync with parent branch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/jenkins-launchpad-plugin-trusty-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/jenkins-launchpad-plugin-ci/53/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'jlp/jenkinsutils.py'
--- jlp/jenkinsutils.py	2016-02-02 14:07:32 +0000
+++ jlp/jenkinsutils.py	2016-02-02 14:07:32 +0000
@@ -1,4 +1,5 @@
 import re
+import os
 from xml.dom.minidom import parseString
 import jenkins
 import urlparse
@@ -592,9 +593,11 @@
     for artifact in artifacts:
         path = artifact['relativePath']
         url = url.rstrip('/')
-        if path.startswith('work/output'):
-            link = "{run_url}/artifact/work/output/*zip*/output.zip"
-            return normalize_url(link.format(run_url=url))
+        if path.endswith('.deb'):
+            dirname = os.path.dirname(path)
+            zipname = os.path.basename(dirname)
+            link = "%s/artifact/%s/*zip*/%s.zip" % (url, dirname, zipname)
+            return normalize_url(link)
     return None