Move client tarballs to main project.

python-novaclient tarballs should be in nova/tarballs.
Add a project parameter to the tarball publisher to handle that,
and update the yaml accordingly.

Change-Id: I184bd4b43e7cc86574ec011e8b2cf0cd14569553

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'
 

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'
 

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'

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'

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'