Merge "always build release notes from master"

jenkins/jobs/openstack-publish-jobs.yaml

@@ -74,6 +74,21 @@
       - revoke-sudo
       - branch-git-prep:
           branch: master
+      - shell: |
+          #!/bin/bash -xe
+          #
+          # When building the release notes after a patch merges we
+          # always want to build from master. Reno will find release
+          # notes on other branches and insert them into the right
+          # places in the documentation build, but only master has all
+          # of the appropriate branch-specific input files for
+          # Sphinx. The branch-git-prep builder checks out the
+          # repository where the current patch just merged, but it
+          # honors zuul configuration variables that may cause it to
+          # check out a patch merged into a stable branch. So, reset
+          # what we've checked out to master.
+          #
+          git checkout origin/master
       - tox:
           envlist: 'releasenotes'