50d8020efe
With pbr tag-based versioning, not having the latest release tag in the master branch makes the output a little nasty. Add a job that makes a merge commit containing the tag on a release from milestone-proposed branch. The merge strategy it uses is 'ours' because we're not attempting to use this to keep code lines up to date - the expectation is that content added in milestone-proposed should already be in master. The main thing we want to do is re-connect the revision and tag history with master, so that things like 'git tag --contains' work. Closes-Bug: 1192039 Change-Id: I06c06bd7542ae493e74fdcaa3c4419f84843cd03
43 lines
860 B
YAML
43 lines
860 B
YAML
- job-template:
|
|
name: '{name}-docs'
|
|
node: precise
|
|
|
|
builders:
|
|
- gerrit-git-prep
|
|
- docs:
|
|
github-org: '{github-org}'
|
|
project: '{name}'
|
|
|
|
publishers:
|
|
- ftp:
|
|
site: '{doc-publisher-site}'
|
|
source: 'doc/build/html/**'
|
|
target: 'developer/{name}'
|
|
remove-prefix: 'doc/build/html'
|
|
excludes: ''
|
|
- console-log
|
|
|
|
|
|
- job-template:
|
|
name: '{name}-merge-release-tags'
|
|
concurrent: false
|
|
|
|
builders:
|
|
- gerrit-git-prep
|
|
- shell: |
|
|
#!/bin/bash -xe
|
|
TAG=`echo $ZUUL_REFNAME | sed 's/refs.tags.//'`
|
|
/usr/local/jenkins/slave_scripts/merge_tags.sh $TAG
|
|
|
|
publishers:
|
|
- console-log
|
|
|
|
node: 'proposal'
|
|
|
|
|
|
- job-group:
|
|
name: openstack-publish-jobs
|
|
jobs:
|
|
- '{name}-docs'
|
|
- '{name}-merge-release-tags'
|