openstack/releases
Code Issues Proposed changes

Merge "Add 'Future' series names to the redirections"

Browse Source
This commit is contained in:
Zuul
2019-03-18 22:11:33 +00:00
committed by Gerrit Code Review
parent b54c1595c3 59c8c13058
commit 8fd1bbb649
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/_exts/deliverables.py
View File

@@ -74,16 +74,18 @@ def _get_category(deliv):
_deliverables = None _deliverables = None
_series_status_data = None
def _initialize_deliverable_data(): def _initialize_deliverable_data():
global _deliverables global _deliverables
global _series_status_data
LOG.info('Loading deliverable data...') LOG.info('Loading deliverable data...')
series_status_data = series_status.SeriesStatus.from_directory( _series_status_data = series_status.SeriesStatus.from_directory(
'deliverables') 'deliverables')
deliverable.Deliverable.init_series_status_data(series_status_data) deliverable.Deliverable.init_series_status_data(_series_status_data)
_deliverables = deliverable.Deliverables('deliverables') _deliverables = deliverable.Deliverables('deliverables')
@@ -472,7 +474,11 @@ def build_finished(app, exception):
if exception is not None: if exception is not None:
return return
redirections = generate_constraints_redirections(_deliverables) future_releases = [series.name
for series in _series_status_data.values()
if series.status == 'future']
redirections = generate_constraints_redirections(_deliverables,
future_releases)
rendered_output = app.builder.templates.render( rendered_output = app.builder.templates.render(
'htaccess', 'htaccess',
dict(redirections=redirections) dict(redirections=redirections)

5
openstack_releases/_redirections.py
View File

@@ -18,7 +18,7 @@ from sphinx.util import logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
def generate_constraints_redirections(_deliverables): def generate_constraints_redirections(_deliverables, future_releases=[]):
redirections = [] redirections = []
# Loop through all the releases for requirements # Loop through all the releases for requirements
for deliv in _deliverables.get_deliverable_history('requirements'): for deliv in _deliverables.get_deliverable_history('requirements'):
@@ -41,4 +41,7 @@ def generate_constraints_redirections(_deliverables):
# master -> juno # master -> juno
redirections.insert(0, dict(code=301, src=deliv.series, dst=target)) redirections.insert(0, dict(code=301, src=deliv.series, dst=target))
for series in future_releases:
redirections.insert(0, dict(code=301, src=series, dst='master'))
return redirections return redirections