Revert "Fix tarball jobs"

Fixes 1005877. Also, an empty master file was put in refs/meta/openstack/release so that the old NOMILESTONE logic should work without weirdness now.

This reverts commit b838629877b12fa044ce237e003b9d81a88bc9d2 and
1bfc9b22fdd1b1a275e1ac7a4e773c9cb8f41ba7 - except for the builders.py change.

Change-Id: I03e02b54e8f13dccd71cc7ec5fdf5d77fa4f42c4

modules/jenkins_jobs/files/modules/builders.py

@@ -66,10 +66,6 @@ class builders(object):
         self._add_script(xml_parent,
           '/usr/local/jenkins/slave_scripts/create-tarball.sh %s' % self.data['main']['project'])
 
-    def _tarball_nomilestone(self, xml_parent):
-        self._add_script(xml_parent,
-          'export NOMILESTONE="true"\n/usr/local/jenkins/slave_scripts/create-tarball.sh %s' % self.data['main']['project'])
-
     def _ppa(self, xml_parent):
         self._add_script(xml_parent, 'rm -rf build dist.zip\n\
 mkdir build')

modules/jenkins_jobs/files/projects/openstack/swift.yml

@@ -1,482 +1,9 @@
----
-# coverage
-modules:
-  - logrotate
-  - properties
-  - scm
-  - assignednode
-  - trigger_pollscm
-  - builders
-  - publisher_coverage
+project:
+  template: 'python_jobs'
 
-main:
-  name: 'swift-coverage'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'false'
-  disabled: 'false' 
-
-trigger:
-  pollscm: '*/15 * * * *'
-
-builders:
-  - coverage
-
-scm:
-  scm: 'true'
-
-assignednode:
-  node: 'oneiric'
-
-logrotate:
-  daysToKeep: 3
-  numToKeep: 20
-  artifactDaysToKeep: -1
-  artifactNumToKeep: -1
-
----
-# pep8-gate
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_pep8
-
-main:
-  name: 'gate-swift-pep8'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'true'
+values:
+  name: 'swift'
   disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'false'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'true'
-  triggerOnRefUpdatedEvent: 'false'
-  triggerApprovalCategory: 'APRV'
-  triggerApprovalValue: 1
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
-
-builders:
-  - gerrit_git_prep
-  - pep8
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: 'oneiric'
-
----
-# python26-gate
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_none
-
-main:
-  name: 'gate-swift-python26'
-  review_site: 'review.openstack.org'
   github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'true'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'false'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'true'
-  triggerOnRefUpdatedEvent: 'false'
-  triggerApprovalCategory: 'APRV'
-  triggerApprovalValue: 1
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
-
-builders:
-  - gerrit_git_prep
-  - python26
-
-scm:
-  scm: 'true'
-
-assignednode:
-  node: 'oneiric'
-
----
-# python27-gate
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_none
-
-main:
-  name: 'gate-swift-python27'
   review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'true'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'false'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'true'
-  triggerOnRefUpdatedEvent: 'false'
-  triggerApprovalCategory: 'APRV'
-  triggerApprovalValue: 1
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
-
-builders:
-  - gerrit_git_prep
-  - python27
-
-scm:
-  scm: 'true'
-
-assignednode:
-  node: 'oneiric'
-
----
-# docs
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_pollscm
-  - builders
-  - publisher_docs
-
-main:
-  name: 'swift-docs'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'false'
-  disabled: 'false'
-
-trigger:
-  pollscm: '*/15 * * * *'
-
-builders:
-  - docs
-
-scm:
-  scm: 'true'
-
-assignednode:
-  node: 'oneiric'
-
-publisher:
-  site: 'nova.openstack.org'
-
----
-# merge-gate
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_none
-
-main:
-  name: 'gate-swift-merge'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'true'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'false'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'true'
-  triggerOnRefUpdatedEvent: 'false'
-  triggerApprovalCategory: 'APRV'
-  triggerApprovalValue: 1
-  failureMessage: 'This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.'
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
-
-builders:
-  - gerrit_git_prep
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: 'oneiric'
-
----
-# ppa
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_none
-  - builders
-  - publisher_ppa
-
-main:
-  name: 'swift-ppa'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'false'
-  disabled: 'true'
-
-builders:
-  - ppa
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: 'oneiric'
-
----
-# tarball
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_tarball
-
-main:
-  name: 'swift-tarball'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBulid: 'false'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'false'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'false'
-  triggerOnRefUpdatedEvent: 'true'
-  triggerApprovalCategory: ''
-  triggerApprovalValue: ''
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'REG_EXP'
-      branchPattern: '^(?!refs/).*$'
-
-builders:
-  - gerrit_git_prep
-  - tarball_nomilestone
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: 'oneiric'
-
-publisher:
-  site: 'nova.openstack.org'
-
-
----
-# pep8-check
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_pep8
-
-main:
-  name: 'check-swift-pep8'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'true'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'true'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'false'
-  triggerOnRefUpdatedEvent: 'false'
-  overrideVotes: 'true'
-  gerritBuildSuccessfulVerifiedValue: 1
-  gerritBuildFailedVerifiedValue: -1
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
-
-builders:
-  - gerrit_git_prep
-  - pep8
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: 'oneiric'
-
----
-# python26-check
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_none
-
-main:
-  name: 'check-swift-python26'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'true'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'true'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'false'
-  triggerOnRefUpdatedEvent: 'false'
-  overrideVotes: 'true'
-  gerritBuildSuccessfulVerifiedValue: 1
-  gerritBuildFailedVerifiedValue: -1
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
-
-builders:
-  - gerrit_git_prep
-  - python26
-
-scm:
-  scm: 'true'
-
-assignednode:
-  node: 'oneiric'
-
----
-# python27-check
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_none
-
-main:
-  name: 'check-swift-python27'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'true'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'true'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'false'
-  triggerOnRefUpdatedEvent: 'false'
-  overrideVotes: 'true'
-  gerritBuildSuccessfulVerifiedValue: 1
-  gerritBuildFailedVerifiedValue: -1
-  failureMessage: ''
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
-
-builders:
-  - gerrit_git_prep
-  - python27
-
-scm:
-  scm: 'true'
-
-assignednode:
-  node: 'oneiric'
-
----
-# merge-check
-modules:
-  - properties
-  - scm
-  - assignednode
-  - trigger_gerrit
-  - builders
-  - publisher_none
-
-main:
-  name: 'check-swift-merge'
-  review_site: 'review.openstack.org'
-  github_org: 'openstack'
-  project: 'swift'
-  authenticatedBuild: 'true'
-  disabled: 'false'
-
-trigger:
-  triggerOnPatchsetUploadedEvent: 'true'
-  triggerOnChangeMergedEvent: 'false'
-  triggerOnCommentAddedEvent: 'false'
-  triggerOnRefUpdatedEvent: 'false'
-  overrideVotes: 'true'
-  gerritBuildSuccessfulVerifiedValue: 1
-  gerritBuildFailedVerifiedValue: -1
-  failureMessage: 'This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.'
-  projects:
-    - projectCompareType: 'PLAIN'
-      projectPattern: 'openstack/swift'
-      branchCompareType: 'ANT'
-      branchPattern: '**'
-
-builders:
-  - gerrit_git_prep
-
-scm:
-  scm: 'false'
-
-assignednode:
-  node: 'oneiric'
-
-
+  publisher_site: 'nova.openstack.org'