add explicit release types for neutron and horizon plugins

Be explicit about the projects that need special release jobs so we
know they are configured correctly.

See
http://lists.openstack.org/pipermail/openstack-dev/2017-October/123926.html
for more details.

Change-Id: I73307fb3233c128c8f878da89c1e850831135bc3
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2017-10-25 12:07:58 -04:00
parent 23dbf8ab95
commit a4dfa9a10a
9 changed files with 26 additions and 5 deletions

View File

@ -419,6 +419,16 @@ The top level of a deliverable file is a mapping with keys:
specified and the validation job can determine that a module is a
nodejs module, it assumes a release-type of ``nodejs``.
``neutron``
For projects using the PyPI publishing variant that installs
neutron in order to build the package. Typically used by neutron
plugins.
``horizon``
For projects using the PyPI publishing variant that installs
horizon in order to build the package. Typically used by horizon
plugins.
``releases``
A list of the releases for the deliverable.

View File

@ -3,6 +3,7 @@ launchpad: networking-midonet
team: neutron
type: other
release-model: cycle-with-milestones
release-type: neutron
include-pypi-link: yes
releases:
- projects:

View File

@ -3,6 +3,7 @@ launchpad: networking-odl
team: neutron
type: other
release-model: cycle-with-milestones
release-type: neutron
include-pypi-link: yes
releases:
- projects:

View File

@ -3,6 +3,7 @@ launchpad: networking-ovn
team: neutron
type: other
release-model: cycle-with-milestones
release-type: neutron
include-pypi-link: yes
releases:
- projects:

View File

@ -3,6 +3,7 @@ launchpad: networking-sfc
team: neutron
type: other
release-model: cycle-with-milestones
release-type: neutron
include-pypi-link: yes
releases:
- projects:

View File

@ -3,6 +3,7 @@ launchpad: neutron
team: neutron
type: other
release-model: cycle-with-milestones
release-type: neutron
releases:
- projects:
- hash: 073622b9df508cfb54fade4073c5243001b61a51

View File

@ -83,10 +83,14 @@ def get_zuul_project_data(url=ZUUL_PROJECTS_URL):
_RELEASE_JOBS_FOR_TYPE = {
'std': [
'publish-to-pypi',
'publish-to-pypi-neutron',
'publish-to-pypi-horizon',
'release-openstack-server',
],
'neutron': [
'publish-to-pypi-neutron',
],
'horizon': [
'publish-to-pypi-horizon',
],
'nodejs': [
'nodejs4-publish-to-npm',
'nodejs6-publish-to-npm',

View File

@ -35,7 +35,7 @@ properties:
type: "object"
release-type:
type: "string"
enum: [ "std", "xstatic", "fuel", "nodejs", "puppet" ]
enum: [ "std", "xstatic", "fuel", "nodejs", "puppet", "neutron", "horizon" ]
stable-branch-type:
type: "string"
enum: [ "std", "tagless", "upstream" ]

View File

@ -21,8 +21,8 @@ import pbr.version
# The values are a three-tuple that contains:
# 1. constructor: The function used to convert the version string in to a
# *Verion object.
# 2. exception: The excpetion raised by the constructor iff version string is invalid
# in some way.
# 2. exception: The exception raised by the constructor iff version
# string is invalid in some way.
# 3. canonicalise: The function used to canonicalise the *Version object.
# Used to verify that the version string is already in the
# canonical form
@ -37,6 +37,8 @@ _VALIDATORS['fuel'] = _VALIDATORS['std']
_VALIDATORS['openstack-manuals'] = _VALIDATORS['std']
_VALIDATORS['puppet'] = _VALIDATORS['std']
_VALIDATORS['nodejs'] = _VALIDATORS['std']
_VALIDATORS['neutron'] = _VALIDATORS['std']
_VALIDATORS['horizon'] = _VALIDATORS['std']
def validate_version(versionstr, release_type='std', pre_ok=True):