openstack/openstack-ansible
Code Issues Proposed changes

Fix latest_tag rendering for stable versions

Browse Source 
Once role is checked out to the branch, pbr increments latest version
which results in not existing tag in the docs.
So we change the way of getting latest tag of the branch to
`git describe`

Change-Id: I6abb27b23290d04d639696b5821932db7da58546
This commit is contained in:
Dmitriy Rabotyagov 2020-04-13 16:47:48 +03:00
parent 600b23b1ad
commit 2deabaeb4c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deploy-guide/source/conf.py
View File

@ -26,7 +26,6 @@ import os
import sys
import subprocess
import pbr.version
import openstackdocstheme
# -- OpenStack-Ansible configuration --------------------------------------
@ -52,7 +51,7 @@ if current_series == "latest":
suse_series = previous_series_name.capitalize()
else:
series_names = current_series.capitalize()
latest_tag = pbr.version.VersionInfo('osa_toolkit').__str__()
latest_tag = subprocess.check_output(["git", "describe", "--abbrev=0", "--tag"]).strip().decode()
rdo_series = current_series_name
suse_series = current_series_name.capitalize()

3
doc/source/conf.py
View File

@ -29,7 +29,6 @@ import sys
import subprocess
import openstackdocstheme
import pbr.version
import yaml
# -- OpenStack-Ansible configuration --------------------------------------
@ -55,7 +54,7 @@ if current_series == "latest":
upgrade_warning = "Upgrading to master is not recommended. Master is under heavy development, and is not stable."
else:
series_names = current_series.capitalize()
latest_tag = pbr.version.VersionInfo('osa_toolkit').__str__()
latest_tag = subprocess.check_output(["git", "describe", "--abbrev=0", "--tag"]).strip().decode()
branch = "stable/{}".format(current_series)
upgrade_warning = "The upgrade is always under active development."