Split jobs into multiple templates.

Change-Id: Ic5f6075aa67cc0819bbccab9295f715920f40bcd

projects/openstack/ceilometer.yml

@@ -6,9 +6,6 @@ values:
   disabled: 'false'
   github_org: 'stackforge'
   review_site: 'review.openstack.org'
-  publisher_site: 'TODO.stackforge.org'
-  tarball_project: 'ceilometer'
-  doc_publisher_site: 'TODO.stackforge.org'
   node: 'oneiric'
 
 ---

projects/openstack/cinder.yml

@@ -1,6 +1,17 @@
 project:
   template: 'python_jobs'
 
+values:
+  name: 'cinder'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'openstack_publish_jobs'
+
 values:
   name: 'cinder'
   disabled: 'false'

projects/openstack/glance.yml

@@ -1,6 +1,17 @@
 project:
   template: 'python_jobs'
 
+values:
+  name: 'glance'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'openstack_publish_jobs'
+
 values:
   name: 'glance'
   disabled: 'false'

projects/openstack/heat.yml

@@ -6,7 +6,4 @@ values:
   disabled: 'false'
   github_org: 'heat-api'
   review_site: 'review.openstack.org'
-  publisher_site: 'TODO.stackforge.org'
-  tarball_project: 'heat'
-  doc_publisher_site: 'TODO.stackforge.org'
   node: 'oneiric'

projects/openstack/horizon.yml

@@ -1,6 +1,17 @@
 project:
   template: 'python_jobs'
 
+values:
+  name: 'horizon'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'openstack_publish_jobs'
+
 values:
   name: 'horizon'
   disabled: 'false'

projects/openstack/keystone.yml

@@ -1,6 +1,17 @@
 project:
   template: 'python_jobs'
 
+values:
+  name: 'keystone'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'openstack_publish_jobs'
+
 values:
   name: 'keystone'
   disabled: 'false'

projects/openstack/nova.yml

@@ -1,6 +1,17 @@
 project:
   template: 'python_jobs'
 
+values:
+  name: 'nova'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'openstack_publish_jobs'
+
 values:
   name: 'nova'
   disabled: 'false'

projects/openstack/openstack-common.yml

@@ -1,6 +1,17 @@
 project:
   template: 'python_jobs'
 
+values:
+  name: 'openstack-common'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'openstack_publish_jobs'
+
 values:
   name: 'openstack-common'
   disabled: 'false'

projects/openstack/python-cinderclient.yml

@@ -1,5 +1,16 @@
 project:
-  template: 'python_library_jobs'
+  template: 'python_jobs'
+
+values:
+  name: 'python-cinderclient'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'pypi_jobs'
 
 values:
   name: 'python-cinderclient'

projects/openstack/python-glanceclient.yml

@@ -1,5 +1,16 @@
 project:
-  template: 'python_library_jobs'
+  template: 'python_jobs'
+
+values:
+  name: 'python-glanceclient'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'pypi_jobs'
 
 values:
   name: 'python-glanceclient'

projects/openstack/python-keystoneclient.yml

@@ -1,5 +1,16 @@
 project:
-  template: 'python_library_jobs'
+  template: 'python_jobs'
+
+values:
+  name: 'python-keystoneclient'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'pypi_jobs'
 
 values:
   name: 'python-keystoneclient'

projects/openstack/python-novaclient.yml

@@ -1,5 +1,16 @@
 project:
-  template: 'python_library_jobs'
+  template: 'python_jobs'
+
+values:
+  name: 'python-novaclient'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'pypi_jobs'
 
 values:
   name: 'python-novaclient'

projects/openstack/python-openstackclient.yml

@@ -1,5 +1,16 @@
 project:
-  template: 'python_library_jobs'
+  template: 'python_jobs'
+
+values:
+  name: 'python-openstackclient'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'pypi_jobs'
 
 values:
   name: 'python-openstackclient'

projects/openstack/python-quantumclient.yml

@@ -1,5 +1,16 @@
 project:
-  template: 'python_library_jobs'
+  template: 'python_jobs'
+
+values:
+  name: 'python-quantumclient'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'pypi_jobs'
 
 values:
   name: 'python-quantumclient'

projects/openstack/python-swiftclient.yml

@@ -1,5 +1,16 @@
 project:
-  template: 'python_library_jobs'
+  template: 'python_jobs'
+
+values:
+  name: 'python-swiftclient'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'pypi_jobs'
 
 values:
   name: 'python-swiftclient'

projects/openstack/quantum.yml

@@ -1,6 +1,17 @@
 project:
   template: 'python_jobs'
 
+values:
+  name: 'quantum'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'openstack_publish_jobs'
+
 values:
   name: 'quantum'
   disabled: 'false'

projects/openstack/reddwarf.yml

@@ -6,7 +6,4 @@ values:
   disabled: 'true'
   github_org: 'stackforge'
   review_site: 'review.openstack.org'
-  publisher_site: 'TODO.stackforge.org'
-  tarball_project: 'reddwarf'
-  doc_publisher_site: 'TODO.stackforge.org'
   node: 'oneiric'

projects/openstack/swift.yml

@@ -1,6 +1,17 @@
 project:
   template: 'python_jobs'
 
+values:
+  name: 'swift'
+  disabled: 'false'
+  github_org: 'openstack'
+  review_site: 'review.openstack.org'
+  node: 'precise'
+
+---
+project:
+  template: 'openstack_publish_jobs'
+
 values:
   name: 'swift'
   disabled: 'false'

templates/openstack_publish_jobs.yml

@@ -0,0 +1,72 @@
+---
+# docs
+main:
+  name: '@NAME@-docs'
+  review_site: '@REVIEW_SITE@'
+  github_org: '@GITHUB_ORG@'
+  project: '@NAME@'
+  authenticatedBuild: 'false'
+  disabled: @DISABLED@
+  concurrent: 'true'
+
+triggers:
+  - zuul_post
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+builders:
+  - gerrit_git_prep
+  - docs
+
+post_build_actions:
+  - ftp:
+      site: '@DOC_PUBLISHER_SITE@'
+      remote_dir: 'developer/@NAME@'
+      source_files: 'doc/build/html/**'
+      remove_prefix: 'doc/build/html'
+      excludes: ''
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: '@NODE@'
+
+---
+# tarball
+main:
+  name: '@NAME@-tarball'
+  review_site: '@REVIEW_SITE@'
+  github_org: '@GITHUB_ORG@'
+  project: '@NAME@'
+  authenticatedBulid: 'false'
+  disabled: @DISABLED@
+  concurrent: 'true'
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+triggers:
+  - zuul_post
+
+builders:
+  - gerrit_git_prep
+  - tarball
+
+post_build_actions:
+  - tarball:
+      site: '@PUBLISHER_SITE@'
+      project: '@TARBALL_PROJECT@'
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: '@NODE@'

templates/pypi_jobs.yml

@@ -0,0 +1,108 @@
+---
+# docs
+main:
+  name: '@NAME@-docs'
+  review_site: '@REVIEW_SITE@'
+  github_org: '@GITHUB_ORG@'
+  project: '@NAME@'
+  authenticatedBuild: 'false'
+  disabled: @DISABLED@
+  concurrent: 'true'
+
+triggers:
+  - zuul_post
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+builders:
+  - gerrit_git_prep
+  - docs
+
+post_build_actions:
+  - ftp:
+      site: '@DOC_PUBLISHER_SITE@'
+      remote_dir: 'developer/@NAME@'
+      source_files: 'doc/build/html/**'
+      remove_prefix: 'doc/build/html'
+      excludes: ''
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: '@NODE@'
+
+---
+# tarball
+main:
+  name: '@NAME@-tarball'
+  review_site: '@REVIEW_SITE@'
+  github_org: '@GITHUB_ORG@'
+  project: '@NAME@'
+  authenticatedBulid: 'false'
+  disabled: @DISABLED@
+  concurrent: 'true'
+
+logrotate:
+  daysToKeep: 28
+  numToKeep: -1
+  artifactDaysToKeep: -1
+  artifactNumToKeep: -1
+
+triggers:
+  - zuul_post
+
+builders:
+  - gerrit_git_prep
+  - shell: |
+      #!/bin/bash -xe
+      BRANCH=$GERRIT_REFNAME
+      BRANCH_PATH=`echo $BRANCH | tr / -`
+
+      tox -v -evenv python setup.py sdist upload
+      cp dist/* dist/@NAME@-$BRANCH_PATH.tar.gz
+
+post_build_actions:
+  - tarball:
+      site: '@PUBLISHER_SITE@'
+      project: '@TARBALL_PROJECT@'
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: '@NODE@'
+
+---
+# pypi-upload
+main:
+  name: '@NAME@-pypi'
+  review_site: '@REVIEW_SITE@'
+  github_org: '@GITHUB_ORG@'
+  project: '@NAME@'
+  authenticatedBulid: 'false'
+  disabled: @DISABLED@
+  concurrent: 'true'
+
+triggers:
+  - zuul_post
+
+builders:
+  - gerrit_git_prep
+  - shell: tox -v -evenv python setup.py sdist upload
+
+post_build_actions:
+  - tarball:
+      site: '@PUBLISHER_SITE@'
+      project: '@TARBALL_PROJECT@'
+
+scm:
+  scm: 'false'
+
+assignednode:
+  node: 'pypi'
+

templates/python_jobs.yml

@@ -133,44 +133,6 @@ scm:
 assignednode:
   node: '@NODE@'
 
----
-# docs
-main:
-  name: '@NAME@-docs'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-triggers:
-  - zuul_post
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-builders:
-  - gerrit_git_prep
-  - docs
-
-post_build_actions:
-  - ftp:
-      site: '@DOC_PUBLISHER_SITE@'
-      remote_dir: 'developer/@NAME@'
-      source_files: 'doc/build/html/**'
-      remove_prefix: 'doc/build/html'
-      excludes: ''
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-
 ---
 # merge-gate
 main:
@@ -230,37 +192,3 @@ scm:
 assignednode:
   node: '@NODE@'
 
----
-# tarball
-main:
-  name: '@NAME@-tarball'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBulid: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-triggers:
-  - zuul_post
-
-builders:
-  - gerrit_git_prep
-  - tarball
-
-post_build_actions:
-  - tarball:
-      site: '@PUBLISHER_SITE@'
-      project: '@TARBALL_PROJECT@'
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'

templates/python_library_jobs.yml

@@ -1,330 +0,0 @@
----
-# coverage
-main:
-  name: '@NAME@-coverage'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-triggers:
-  - zuul_post
-
-builders:
-  - gerrit_git_prep
-  - coverage
-
-post_build_actions:
-  - coverage
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-
----
-# pep8-gate
-main:
-  name: 'gate-@NAME@-pep8'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-triggers:
-  - zuul
-
-builders:
-  - gerrit_git_prep
-  - pep8
-
-post_build_actions:
-  - pep8
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-
----
-# python26-gate
-main:
-  name: 'gate-@NAME@-python26'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-triggers:
-  - zuul
-
-builders:
-  - gerrit_git_prep
-  - python26
-
-post_build_actions:
-  - junit:
-      results: '**/nosetests.xml'
-
-scm:
-  scm: 'false'
-
-# >= precise does not have python2.6
-assignednode:
-  node: 'oneiric'
-
----
-# python27-gate
-main:
-  name: 'gate-@NAME@-python27'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-triggers:
-  - zuul
-
-builders:
-  - gerrit_git_prep
-  - python27
-
-post_build_actions:
-  - junit:
-      results: '**/nosetests.xml'
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-
----
-# docs
-main:
-  name: '@NAME@-docs'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-triggers:
-  - zuul_post
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-builders:
-  - gerrit_git_prep
-  - docs
-
-post_build_actions:
-  - ftp:
-      site: '@DOC_PUBLISHER_SITE@'
-      remote_dir: 'developer/@NAME@'
-      source_files: 'doc/build/html/**'
-      remove_prefix: 'doc/build/html'
-      excludes: ''
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-
----
-# merge-gate
-main:
-  name: 'gate-@NAME@-merge'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-triggers:
-  - zuul
-
-builders:
-  - gerrit_git_prep
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-
----
-# ppa
-main:
-  name: '@NAME@-ppa'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: true
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-builders:
-  - ppa
-
-post_build_actions:
-  - ppa
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-
----
-# tarball
-main:
-  name: '@NAME@-tarball'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBulid: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-triggers:
-  - zuul_post
-
-builders:
-  - gerrit_git_prep
-  - shell: |
-      #!/bin/bash -xe
-      BRANCH=$GERRIT_REFNAME
-      BRANCH_PATH=`echo $BRANCH | tr / -`
-
-      tox -v -evenv python setup.py sdist upload
-      cp dist/* dist/@NAME@-$BRANCH_PATH.tar.gz
-
-post_build_actions:
-  - tarball:
-      site: '@PUBLISHER_SITE@'
-      project: '@TARBALL_PROJECT@'
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-
----
-# pypi-upload
-main:
-  name: '@NAME@-pypi'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBulid: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-triggers:
-  - zuul_post
-
-builders:
-  - gerrit_git_prep
-  - shell: tox -v -evenv python setup.py sdist upload
-
-post_build_actions:
-  - tarball:
-      site: '@PUBLISHER_SITE@'
-      project: '@TARBALL_PROJECT@'
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: 'pypi'
-
----
-# docs-gate
-main:
-  name: 'gate-@NAME@-docs'
-  review_site: '@REVIEW_SITE@'
-  github_org: '@GITHUB_ORG@'
-  project: '@NAME@'
-  authenticatedBuild: 'false'
-  disabled: @DISABLED@
-  concurrent: 'true'
-
-logrotate:
-  daysToKeep: 28
-  numToKeep: -1
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
-triggers:
-  - zuul
-
-builders:
-  - gerrit_git_prep
-  - docs
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: '@NODE@'
-