From 2deabaeb4cd25a12dd126563787105baa4530025 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 13 Apr 2020 16:47:48 +0300 Subject: [PATCH] Fix latest_tag rendering for stable versions 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 --- deploy-guide/source/conf.py | 3 +-- doc/source/conf.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py index 0960a5b502..8ac6838f85 100644 --- a/deploy-guide/source/conf.py +++ b/deploy-guide/source/conf.py @@ -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() diff --git a/doc/source/conf.py b/doc/source/conf.py index a6565b9ea4..db8be3fb8b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -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."