Separate Puppet OpenStack tarball jobs from Python jobs

Because Puppet OpenStack modules require specific logics and packages to
be released and archived, we think it's better to separate the jobs that
create tarballs from Python jobs.

This patch:
* Create a job-template "{name}-puppet-tarball" with all required logic
  to create tarballs from Puppet modules.
* Create a job-group "puppet-release-jobs" which contains
  "{name}-puppet-tarball" and other regular release jobs. (It replaced
  "{name}-tarball").
* Use the new jobgroup for all Puppet OpenStack modules.
* Move {name}-branch-tarball into the new job-template.
* Remove Puppet logic in scripts/run-tarball.sh and jenkins/scripts/run-wheel.sh
  which is not needed anymore.
* Create a new Zuul layout called "puppet-release-jobs" which contains
  the jobs needed to release Puppet OpenStack modules.
* Use the new layout for all Puppet OpenStack modules.
* Remove puppet-branch-tarball-jobs layout and move the {name}-branch-tarball job
  into the new layout.

Change-Id: Idb3811bae16321717e5e5467fc3c56492ed57520

jenkins/jobs/projects.yaml

@@ -10440,7 +10440,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10452,7 +10452,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-apparmor
@@ -10540,7 +10539,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10552,7 +10551,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-bugdaystats
@@ -10589,7 +10587,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10601,14 +10599,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-ceph
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10620,7 +10617,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-cgit
@@ -10642,7 +10638,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10654,7 +10650,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-ciwatch
@@ -10676,7 +10671,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10688,14 +10683,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-congress
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10707,14 +10701,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-designate
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10726,7 +10719,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-diskimage_builder
@@ -10778,7 +10770,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10790,7 +10782,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-elastic_recheck
@@ -10887,7 +10878,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-xenial:
@@ -10896,7 +10887,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-germqtt
@@ -10957,7 +10947,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10969,14 +10959,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-glare
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -10988,14 +10977,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-gnocchi
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11007,7 +10995,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-grafyaml
@@ -11059,7 +11046,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11071,14 +11058,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-horizon
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11090,7 +11076,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-hound
@@ -11173,7 +11158,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11185,7 +11170,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-jeepyb
@@ -11237,7 +11221,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11249,7 +11233,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-kibana
@@ -11340,6 +11323,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11351,8 +11335,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
-      - openstack-server-release-jobs
 
 - project:
     name: puppet-mailman
@@ -11374,7 +11356,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11386,7 +11368,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-mediawiki
@@ -11439,7 +11420,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11451,7 +11432,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-monasca
@@ -11483,7 +11463,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11498,7 +11478,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-mysql_backup
@@ -11527,7 +11506,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11539,7 +11518,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-nodepool
@@ -11561,7 +11539,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11573,14 +11551,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-octavia
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11592,7 +11569,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-odsreg
@@ -11635,7 +11611,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11647,7 +11623,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-openstack-guide
@@ -11750,7 +11725,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11762,7 +11737,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-os_client_config
@@ -11784,7 +11758,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11796,14 +11770,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-ovn
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11815,14 +11788,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-pacemaker
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11834,7 +11806,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-packagekit
@@ -11856,7 +11827,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11868,7 +11839,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-pgsql_backup
@@ -11965,7 +11935,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11983,7 +11953,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -11995,7 +11965,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-redis
@@ -12062,7 +12031,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12074,7 +12043,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-setproxy
@@ -12223,7 +12191,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12235,14 +12203,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-tacker
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12254,14 +12221,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-tempest
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12273,7 +12239,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-tmpreaper
@@ -12309,10 +12274,9 @@
     name: puppet-tripleo
 
     jobs:
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
-      - '{name}-branch-tarball'
       - openstack-releasenotes-jobs
 
 - project:
@@ -12320,7 +12284,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12332,7 +12296,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-ulimit
@@ -12414,7 +12377,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12426,14 +12389,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-vswitch
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12445,14 +12407,13 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-watcher
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12464,7 +12425,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-yum
@@ -12501,7 +12461,7 @@
 
     jobs:
       - openstack-releasenotes-jobs
-      - openstack-server-release-jobs
+      - puppet-release-jobs
       - puppet-check-jobs
       - puppet-module-unit
       - puppet-beaker-jobs-trusty:
@@ -12513,7 +12473,6 @@
       - puppet-beaker-jobs-centos7:
           suffix: ''
           branch-override: default
-      - '{name}-branch-tarball'
 
 - project:
     name: puppet-zuul

jenkins/jobs/puppet-module-jobs.yaml

@@ -336,6 +336,45 @@
     publishers:
       - console-log
 
+- job-template:
+    name: '{name}-puppet-tarball'
+    node: ubuntu-xenial
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - install-distro-packages
+      - puppet-agent-install
+      - revoke-sudo
+      - zuul-clone:
+          project: $ZUUL_PROJECT
+      - shell: |
+          #!/bin/bash -xe
+          cd $ZUUL_PROJECT
+          # try to find the modulename, ex: puppet-aodh
+          # we have to use sed because workspace is puppet-aodh-branch-tarball
+          # or puppet-aodh-tarball and not puppet-aodh.
+          MODULE_NAME=$(basename `git rev-parse --show-toplevel` | sed "s/\(-branch\)\?-tarball$//")
+          puppet module build .
+          # NOTE(pabelanger): Here we are converting openstack-neutron-8.0.0.tar.gz to
+          # puppet-neutron-8.0.0.tar.gz.
+          find . -name openstack-*.tar.gz | sed -e "p;s/openstack-/puppet-/" | xargs -n2 mv
+          mkdir -p dist
+          if echo $ZUUL_REFNAME | grep refs/tags/ >/dev/null ; then
+              # NOTE(pabelanger) We don't need to rename tagged tarballs as `puppet
+              # module build` does the right thing.
+              mv pkg/*.tar.gz dist/
+          else
+              mv pkg/*.tar.gz dist/$MODULE_NAME.tar.gz
+          fi
+          mv dist ../
+
+    publishers:
+      - tarball:
+          project: '{name}'
+      - test-results
+      - console-log
+
 - job:
     name: propose-puppet-openstack-constraints
     node: proposal
@@ -442,3 +481,11 @@
       - 'gate-puppet-openstack-libraries-puppet-syntax-{puppet_version}-{legacy}{node}'
       - 'gate-puppet-openstack-libraries-puppet-unit-{node}'
       - 'gate-puppet-openstack-libraries-puppet-beaker-rspec-{node}'
+
+- job-group:
+    name: puppet-release-jobs
+    jobs:
+      - '{name}-announce-release'
+      - '{name}-puppet-tarball'
+      - '{name}-tarball-signing'
+      - '{name}-branch-tarball'

jenkins/scripts/run-tarball.sh

@@ -14,33 +14,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# this is a puppet module
+venv=${1:-venv}
-if [ -r metadata.json ]; then
-    # try to find the modulename, ex: puppet-aodh
-    # we have to use sed because workspace is puppet-aodh-branch-tarball
-    # or puppet-aodh-tarball and not puppet-aodh.
-    MODULE_NAME=$(basename `git rev-parse --show-toplevel` | sed "s/\(-branch\)\?-tarball$//")
-    puppet module build .
-    # NOTE(pabelanger): Here we are converting openstack-neutron-8.0.0.tar.gz to
-    # puppet-neutron-8.0.0.tar.gz.
-    find . -name openstack-*.tar.gz | sed -e "p;s/openstack-/puppet-/" | xargs -n2 mv
-    mkdir -p dist
-    if echo $ZUUL_REFNAME | grep refs/tags/ >/dev/null ; then
-        # NOTE(pabelanger) We don't need to rename tagged tarballs as `puppet
-        # module build` does the right thing.
-        mv pkg/*.tar.gz dist/
-    else
-        mv pkg/*.tar.gz dist/$MODULE_NAME.tar.gz
-    fi
-else
-# this a python project
-    venv=${1:-venv}
 
-    export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt
+export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt
 
-    rm -f dist/*.tar.gz
+rm -f dist/*.tar.gz
-    tox -e$venv python setup.py sdist
+tox -e$venv python setup.py sdist
-fi
 
 FILES=dist/*.tar.gz
 for f in $FILES; do

jenkins/scripts/run-wheel.sh

@@ -14,13 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# metadata.json is a file present in Puppet modules but not in Python projects.
-# Based on this information, we'll run wheel only on Python projects.
-# This conditionnal allows to run tarball JJB macro for both types of projects.
-if [ -r metadata.json ]; then
-    exit 0
-fi
-
 venv=${1:-venv}
 
 export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt

zuul/layout.yaml

@@ -720,6 +720,19 @@ project-templates:
         - '{name}-tarball-signing'
         - '{name}-announce-release'
 
+  # Release Puppet OpenStack packages.
+  - name: puppet-release-jobs
+    pre-release:
+      - '{name}-puppet-tarball':
+        - '{name}-tarball-signing'
+        - '{name}-announce-release'
+    release:
+      - '{name}-puppet-tarball':
+        - '{name}-tarball-signing'
+        - '{name}-announce-release'
+    post:
+      - '{name}-branch-tarball'
+
   - name: release-notes-jobs
     check:
       - 'gate-{name}-releasenotes'
@@ -790,10 +803,6 @@ project-templates:
       - gate-packstack-integration-scenario002-tempest-centos-7
       - gate-packstack-integration-scenario003-tempest-centos-7
 
-  - name: puppet-branch-tarball-jobs
-    post:
-      - '{name}-branch-tarball'
-
   - name: puppet-beaker-jobs
     check:
       - gate-{name}-puppet-beaker-rspec-centos-7
@@ -15254,8 +15263,7 @@ projects:
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario001
       - name: tripleo-scenario-jobs-scenario001
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-autossh
     template:
@@ -15269,8 +15277,7 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: release-notes-jobs
       # barbican is only deployed on scenario002 (both Puppet and TripleO CIs)
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
@@ -15289,8 +15296,7 @@ projects:
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario001
       - name: tripleo-scenario-jobs-scenario001
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-ceph
     template:
@@ -15306,8 +15312,7 @@ projects:
       - name: puppet-openstack-integration-jobs-scenario004
       - name: tripleo-scenario-jobs-scenario001
       - name: tripleo-scenario-jobs-scenario004
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton
       - gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata
@@ -15326,8 +15331,7 @@ projects:
       - name: puppet-openstack-integration-jobs-scenario002
       - name: tripleo-scenario-jobs-scenario001
       - name: tripleo-scenario-jobs-scenario002
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-nonha-puppet-newton
       - gate-tripleo-ci-centos-7-ovb-nonha-puppet-ocata
@@ -15339,9 +15343,8 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
-      - name: openstack-server-release-jobs
+      - name: puppet-release-jobs
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
 
   - name: openstack/puppet-congress
     template:
@@ -15351,8 +15354,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-scenario-jobs-scenario001
 
   - name: openstack/puppet-designate
@@ -15363,8 +15365,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       # designate is only deployed on scenario003
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario003
@@ -15377,8 +15378,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       # ec2api is only deployed on scenario002 (both Puppet and TripleO CIs)
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario002
@@ -15392,8 +15392,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-glance
     template:
@@ -15404,8 +15403,7 @@ projects:
       - name: puppet-beaker-jobs-xenial
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-puppet-jobs
 
   - name: openstack/puppet-glare
@@ -15415,8 +15413,7 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
-      - name: openstack-server-release-jobs
+      - name: puppet-release-jobs
-      - name: puppet-branch-tarball-jobs
       - name: release-notes-jobs
 
   - name: openstack/puppet-gnocchi
@@ -15431,8 +15428,7 @@ projects:
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario001
       - name: tripleo-scenario-jobs-scenario001
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-heat
     template:
@@ -15445,8 +15441,7 @@ projects:
       # heat is only deployed on scenario003
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario003
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-puppet-jobs
 
   - name: openstack/puppet-horizon
@@ -15461,8 +15456,7 @@ projects:
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario003
       - name: tripleo-scenario-jobs-scenario003
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-ironic
     template:
@@ -15475,8 +15469,7 @@ projects:
       # ironic is only deployed on scenario002
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario002
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-nonha
 
@@ -15489,8 +15482,7 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-puppet-jobs
 
   - name: openstack/puppet-magnum
@@ -15501,8 +15493,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-manila
     template:
@@ -15512,8 +15503,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-scenario-jobs-scenario004
 
   - name: openstack/puppet-midonet
@@ -15549,8 +15539,7 @@ projects:
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario003
       - name: tripleo-scenario-jobs-scenario003
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-ha-oooq
 
@@ -15573,8 +15562,7 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-beaker-jobs
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
     check:
       - gate-puppet-murano-puppet-beaker-rspec-ubuntu-xenial-nv
 
@@ -15593,8 +15581,7 @@ projects:
       - name: puppet-beaker-jobs-xenial
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-ha-oooq
 
@@ -15607,8 +15594,7 @@ projects:
       - name: puppet-beaker-jobs-xenial
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-ha-oooq
 
@@ -15620,8 +15606,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-openstack-cookiecutter
     template:
@@ -15637,8 +15622,7 @@ projects:
       - name: puppet-beaker-jobs-xenial
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-openstack-guide
     template:
@@ -15684,8 +15668,7 @@ projects:
       - name: puppet-beaker-jobs-xenial
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-puppet-jobs
 
   - name: openstack/puppet-oslo
@@ -15697,8 +15680,7 @@ projects:
       - name: puppet-beaker-jobs-xenial
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-puppet-jobs
 
   - name: openstack/puppet-ovn
@@ -15709,8 +15691,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-pacemaker
     template:
@@ -15720,8 +15701,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
     check-tripleo:
       - gate-tripleo-ci-centos-7-ovb-ha-oooq
 
@@ -15732,7 +15712,7 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
-      - name: openstack-server-release-jobs
+      - name: puppet-release-jobs
       - name: release-notes-jobs
       # panko is only deployed on scenario001 (both Puppet and TripleO CIs)
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
@@ -15746,7 +15726,7 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
-      - name: openstack-server-release-jobs
+      - name: puppet-release-jobs
       - name: release-notes-jobs
 
   - name: openstack/puppet-rally
@@ -15756,8 +15736,7 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: release-notes-jobs
 
   - name: openstack/puppet-sahara
@@ -15772,8 +15751,7 @@ projects:
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario003
       - name: tripleo-scenario-jobs-scenario003
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-setproxy
     template:
@@ -15797,8 +15775,7 @@ projects:
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario002
       - name: tripleo-scenario-jobs-scenario002
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-puppet-jobs
 
   - name: openstack/puppet-tacker
@@ -15809,8 +15786,7 @@ projects:
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-scenario-jobs-scenario001
 
   - name: openstack/puppet-tempest
@@ -15822,8 +15798,7 @@ projects:
       - name: puppet-beaker-jobs-xenial
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-tripleo
     template:
@@ -15831,8 +15806,7 @@ projects:
       - name: puppet-check-jobs
       - name: check-tripleo-jobs
       - name: check-tripleo-undercloud-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: experimental-tripleo-jobs
       - name: release-notes-jobs
       - name: tripleo-upgrade-jobs
@@ -15857,8 +15831,7 @@ projects:
       # trove is only deployed on scenario003
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario003
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-tuskar
     template:
@@ -15872,8 +15845,7 @@ projects:
       - name: puppet-module-unit-jobs
       - name: puppet-beaker-jobs
       - name: puppet-beaker-jobs-xenial
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: release-notes-jobs
       # vitrage is only deployed on scenario001
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
@@ -15888,8 +15860,7 @@ projects:
       - name: puppet-beaker-jobs-xenial
       - name: puppet-openstack-integration-jobs-all
       - name: release-notes-jobs
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
       - name: tripleo-puppet-jobs
 
   - name: openstack/puppet-watcher
@@ -15903,8 +15874,7 @@ projects:
       # watcher is deployed on scenario004
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario004
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/puppet-zaqar
     template:
@@ -15918,8 +15888,7 @@ projects:
       # https://git.openstack.org/cgit/openstack/puppet-openstack-integration/tree/README.md
       - name: puppet-openstack-integration-jobs-scenario002
       - name: tripleo-scenario-jobs-scenario002
-      - name: puppet-branch-tarball-jobs
+      - name: puppet-release-jobs
-      - name: openstack-server-release-jobs
 
   - name: openstack/pycadf
     template: