Merge "Fix instack jobs (again)"

This commit is contained in:
Zuul 2018-11-01 17:46:28 +00:00 committed by Gerrit Code Review
commit 6884c6b89a

View File

@ -4319,8 +4319,8 @@
- project:
name: openstack/instack
templates:
- publish-to-pypi-python3
# NOTE(aschultz): these have to dupe the publish-to-pypi-python3 jobs
# because of the branch designation for the release job
check:
jobs:
- noop:
@ -4333,12 +4333,23 @@
branches: master
- test-release-openstack-python3:
branches: ^(?!master).*$
pre-release:
jobs:
- release-openstack-python3
release:
jobs:
- release-openstack-python3
- announce-release:
dependencies:
- release-openstack-python3
- propose-update-constraints:
dependencies:
- release-openstack-python3
- project:
name: openstack/instack-undercloud
templates:
- publish-to-pypi-python3
# NOTE(aschultz): these have to dupe the publish-to-pypi-python3 jobs
# because of the branch designation for the release job
check:
jobs:
- noop:
@ -4351,6 +4362,18 @@
branches: master
- test-release-openstack-python3:
branches: ^(?!master).*$
pre-release:
jobs:
- release-openstack-python3
release:
jobs:
- release-openstack-python3
- announce-release:
dependencies:
- release-openstack-python3
- propose-update-constraints:
dependencies:
- release-openstack-python3
- project:
name: openstack/intel-nfv-ci-tests