openstack/openstack-ansible
Code Issues Proposed changes

Merge "Fix latest_tag rendering for stable versions"

Browse Source
This commit is contained in:
Zuul 2020-04-14 11:36:40 +00:00 committed by Gerrit Code Review
commit 16d6c9bb06
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 sys
import subprocess import subprocess
import pbr.version
import openstackdocstheme import openstackdocstheme
# -- OpenStack-Ansible configuration -------------------------------------- # -- OpenStack-Ansible configuration --------------------------------------
@ -52,7 +51,7 @@ if current_series == "latest":
suse_series = previous_series_name.capitalize() suse_series = previous_series_name.capitalize()
else: else:
series_names = current_series.capitalize() 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 rdo_series = current_series_name
suse_series = current_series_name.capitalize() suse_series = current_series_name.capitalize()

3
doc/source/conf.py
View File

@ -29,7 +29,6 @@ import sys
import subprocess import subprocess
import openstackdocstheme import openstackdocstheme
import pbr.version
import yaml import yaml
# -- OpenStack-Ansible configuration -------------------------------------- # -- 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." upgrade_warning = "Upgrading to master is not recommended. Master is under heavy development, and is not stable."
else: else:
series_names = current_series.capitalize() 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) branch = "stable/{}".format(current_series)
upgrade_warning = "The upgrade is always under active development." upgrade_warning = "The upgrade is always under active development."