diff --git a/modules/jenkins_jobs/files/modules/publishers.py b/modules/jenkins_jobs/files/modules/publishers.py index 528a27429b..41f33fdbb4 100644 --- a/modules/jenkins_jobs/files/modules/publishers.py +++ b/modules/jenkins_jobs/files/modules/publishers.py @@ -276,6 +276,7 @@ class Publishers(object): # To use you add the following into your YAML: # publish: # site: 'glance.openstack.org' + # dir: 'glance' def _publisher_tarball(self, xml_parent, data): site = data['site'] @@ -286,7 +287,7 @@ class Publishers(object): XML.SubElement(scp, 'siteName').text = site entries = XML.SubElement(scp, 'entries') entry = XML.SubElement(entries, 'be.certipost.hudson.plugin.Entry') - XML.SubElement(entry, 'filePath').text = 'tarballs/{proj}/'.format(proj=self.data['main']['project']) + XML.SubElement(entry, 'filePath').text = 'tarballs/{proj}/'.format(proj=data['project']) XML.SubElement(entry, 'sourceFile').text = 'dist/*.tar.gz' XML.SubElement(entry, 'keepHierarchy').text = 'false' diff --git a/modules/jenkins_jobs/files/projects/openstack/cinder.yml b/modules/jenkins_jobs/files/projects/openstack/cinder.yml index 461ae33056..67f0b5faa8 100644 --- a/modules/jenkins_jobs/files/projects/openstack/cinder.yml +++ b/modules/jenkins_jobs/files/projects/openstack/cinder.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'cinder' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/glance.yml b/modules/jenkins_jobs/files/projects/openstack/glance.yml index 98f6493abe..f4f3334231 100644 --- a/modules/jenkins_jobs/files/projects/openstack/glance.yml +++ b/modules/jenkins_jobs/files/projects/openstack/glance.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'glance' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/horizon.yml b/modules/jenkins_jobs/files/projects/openstack/horizon.yml index 4a72401a47..72c6b871b7 100644 --- a/modules/jenkins_jobs/files/projects/openstack/horizon.yml +++ b/modules/jenkins_jobs/files/projects/openstack/horizon.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'horizon' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/keystone.yml b/modules/jenkins_jobs/files/projects/openstack/keystone.yml index 998bd537e6..872d6e90d3 100644 --- a/modules/jenkins_jobs/files/projects/openstack/keystone.yml +++ b/modules/jenkins_jobs/files/projects/openstack/keystone.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'keystone' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/nova.yml b/modules/jenkins_jobs/files/projects/openstack/nova.yml index d2f7ac27e7..385205f6ef 100644 --- a/modules/jenkins_jobs/files/projects/openstack/nova.yml +++ b/modules/jenkins_jobs/files/projects/openstack/nova.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'nova' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml index 03e7ad2fcf..63ab477854 100644 --- a/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml +++ b/modules/jenkins_jobs/files/projects/openstack/python-cinderclient.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'cinder' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml index 61e7407523..501435b88f 100644 --- a/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml +++ b/modules/jenkins_jobs/files/projects/openstack/python-glanceclient.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'glance' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml index 33c248a8c4..7e8928bdfa 100644 --- a/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml +++ b/modules/jenkins_jobs/files/projects/openstack/python-keystoneclient.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'keystone' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml index 5ab75e327d..f54f99000c 100644 --- a/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml +++ b/modules/jenkins_jobs/files/projects/openstack/python-novaclient.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'nova' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml index 2fce146817..4b733f6346 100644 --- a/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml +++ b/modules/jenkins_jobs/files/projects/openstack/python-openstackclient.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'python-openstackclient' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml index 19c105439f..5ab962d5c0 100644 --- a/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml +++ b/modules/jenkins_jobs/files/projects/openstack/python-quantumclient.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'quantum' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml b/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml index 9690057114..29db003820 100644 --- a/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml +++ b/modules/jenkins_jobs/files/projects/openstack/python-swiftclient.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'swift.openstack.org' + tarball_project: 'swift' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/quantum.yml b/modules/jenkins_jobs/files/projects/openstack/quantum.yml index f29717a0e3..1f6df4452d 100644 --- a/modules/jenkins_jobs/files/projects/openstack/quantum.yml +++ b/modules/jenkins_jobs/files/projects/openstack/quantum.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'quantum' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/openstack/swift.yml b/modules/jenkins_jobs/files/projects/openstack/swift.yml index e2bb33e4b5..990a83275d 100644 --- a/modules/jenkins_jobs/files/projects/openstack/swift.yml +++ b/modules/jenkins_jobs/files/projects/openstack/swift.yml @@ -7,5 +7,6 @@ values: github_org: 'openstack' review_site: 'review.openstack.org' publisher_site: 'nova.openstack.org' + tarball_project: 'swift' doc_publisher_site: 'docs.openstack.org' node: 'precise' diff --git a/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml b/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml index bb9ba999be..0f48d7755c 100644 --- a/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml +++ b/modules/jenkins_jobs/files/projects/stackforge/ceilometer.yml @@ -7,6 +7,7 @@ values: github_org: 'stackforge' review_site: 'review.stackforge.org' publisher_site: 'TODO.stackforge.org' + tarball_project: 'ceilometer' doc_publisher_site: 'TODO.stackforge.org' node: 'oneiric' diff --git a/modules/jenkins_jobs/files/projects/stackforge/heat.yml b/modules/jenkins_jobs/files/projects/stackforge/heat.yml index 0f4c3623d9..b850ee29e6 100644 --- a/modules/jenkins_jobs/files/projects/stackforge/heat.yml +++ b/modules/jenkins_jobs/files/projects/stackforge/heat.yml @@ -7,5 +7,6 @@ values: github_org: 'heat-api' review_site: 'review.stackforge.org' publisher_site: 'TODO.stackforge.org' + tarball_project: 'heat' doc_publisher_site: 'TODO.stackforge.org' node: 'oneiric' diff --git a/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml b/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml index 1b942d82ee..6d0b2576b4 100644 --- a/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml +++ b/modules/jenkins_jobs/files/projects/stackforge/reddwarf.yml @@ -7,5 +7,6 @@ values: github_org: 'stackforge' review_site: 'review.stackforge.org' publisher_site: 'TODO.stackforge.org' + tarball_project: 'reddwarf' doc_publisher_site: 'TODO.stackforge.org' node: 'oneiric' diff --git a/modules/jenkins_jobs/files/templates/python_jobs.yml b/modules/jenkins_jobs/files/templates/python_jobs.yml index b04a8ef4ec..0d12f0c6bd 100644 --- a/modules/jenkins_jobs/files/templates/python_jobs.yml +++ b/modules/jenkins_jobs/files/templates/python_jobs.yml @@ -251,6 +251,7 @@ builders: post_build_actions: - tarball: site: '@PUBLISHER_SITE@' + project: '@TARBALL_PROJECT@' scm: scm: 'false'