Merge "Fix releasenotes post job"

jenkins/jobs/macros.yaml

@@ -67,9 +67,9 @@
       - shell: |
           #!/bin/bash -xe
           CLONEMAP=`mktemp`
-          function cleanup {
+          function cleanup {{
               rm -f $CLONEMAP
-          }
+          }}
           trap cleanup EXIT
           cat > $CLONEMAP << EOF
           clonemap:

jenkins/jobs/openstack-publish-jobs.yaml

@@ -62,8 +62,8 @@
 
     builders:
       - revoke-sudo
-      - branch-git-prep:
-          branch: master
+      - zuul-git-branch-prep:
+          branch-override: master
       - tox:
           envlist: 'releasenotes'
 

zuul/layout.yaml

@@ -2134,6 +2134,10 @@ jobs:
       - '^tox.ini'
       - '^.*requirements.txt$'
 
+    # Post job is run on liberty and newer branches only
+  - name: ^(?!gate).*-releasenotes$
+    branch: ^(?!stable/(?:juno|kilo)).*$
+
   # Constraints Jobs
   - name: ^gate-.*-constraints$
     branch: ^(?!stable/(?:juno|kilo)).*$