From e2fefea34d230f169b36a60fec1d60c14d834482 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Tue, 28 Mar 2023 00:08:35 -0700
Subject: [PATCH] recipes-devtools: fix the do_install failure for pkgs

Set PBR_VERSION to disable all version calculation logic
of pbr the supplied version will be considered absolute.

Closes-bug: 2013029

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ia038c1c7f10170413051e5b3addd337d3559f3ff
---
 .../python/python-keystoneclient_git.bbappend                 | 3 ++-
 .../recipes-devtools/python/python-openstacksdk_git.bbappend  | 2 ++
 .../os-service-types/python2-os-service-types_1.3.0.bb        | 2 ++
 meta-stx-flock/stx-config/cgts-client.bb                      | 3 +++
 meta-stx-flock/stx-config/sysinv.bb                           | 2 ++
 .../distributedcloud-client-dcmanager_git.bb                  | 2 ++
 meta-stx-flock/stx-distributedcloud/distributedcloud_git.bb   | 2 ++
 meta-stx-flock/stx-fault/python-fmclient.bb                   | 2 ++
 meta-stx-flock/stx-gui/stx-gui.bb                             | 2 ++
 .../recipes-devtools/python/python-aodhclient_git.bb          | 3 ++-
 meta-stx-integ/recipes-devtools/python/python-barbican_git.bb | 2 ++
 .../python/python-barbicanclient_git.bbappend                 | 2 ++
 .../recipes-devtools/python/python-castellan_git.bb           | 2 ++
 .../recipes-devtools/python/python-cinderclient_git.bb        | 2 ++
 .../recipes-devtools/python/python-glanceclient_git.bb        | 2 ++
 .../recipes-devtools/python/python-gnocchiclient_7.0.4.bb     | 2 ++
 .../recipes-devtools/python/python-heatclient_git.bbappend    | 2 ++
 .../recipes-devtools/python/python-ironicclient_git.bb        | 2 ++
 meta-stx-integ/recipes-devtools/python/python-keystone_git.bb | 2 ++
 .../recipes-devtools/python/python-keystonemiddleware_git.bb  | 2 ++
 meta-stx-integ/recipes-devtools/python/python-ldappool_git.bb | 2 ++
 .../recipes-devtools/python/python-neutronclient_git.bb       | 2 ++
 .../recipes-devtools/python/python-novaclient_git.bb          | 2 ++
 .../python/python-openstackclient_git.bbappend                | 4 ++--
 .../python/python-os-client-config_git.bbappend               | 1 +
 .../recipes-devtools/python/python-oslo.cache_git.bb          | 2 ++
 .../recipes-devtools/python/python-oslo.concurrency_git.bb    | 2 ++
 .../recipes-devtools/python/python-oslo.config_git.bb         | 3 ++-
 .../recipes-devtools/python/python-oslo.context_git.bb        | 2 ++
 meta-stx-integ/recipes-devtools/python/python-oslo.db_git.bb  | 2 ++
 .../recipes-devtools/python/python-oslo.i18n_%.bbappend       | 1 +
 meta-stx-integ/recipes-devtools/python/python-oslo.log_git.bb | 2 ++
 .../python/python-oslo.messaging_git.bbappend                 | 1 +
 .../recipes-devtools/python/python-oslo.middleware_git.bb     | 2 ++
 .../recipes-devtools/python/python-oslo.policy_git.bb         | 2 ++
 .../recipes-devtools/python/python-oslo.rootwrap_git.bbappend | 1 +
 .../recipes-devtools/python/python-oslo.serialization_git.bb  | 2 ++
 .../recipes-devtools/python/python-oslo.service_git.bbappend  | 1 +
 .../recipes-devtools/python/python-oslo.upgradecheck_git.bb   | 2 ++
 .../recipes-devtools/python/python-oslo.utils_git.bbappend    | 1 +
 .../python/python-oslo.versionedobjects_git.bb                | 2 ++
 .../recipes-devtools/python/python-osprofiler_git.bb          | 2 ++
 .../recipes-devtools/python/python-pankoclient_git.bb         | 2 ++
 .../recipes-devtools/python/python-pycadf_git.bbappend        | 1 +
 .../recipes-devtools/python/python-redfishtool_git.bb         | 2 ++
 .../recipes-devtools/python/python-swiftclient_git.bbappend   | 1 +
 46 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 meta-stx-integ/recipes-devtools/python/python-os-client-config_git.bbappend
 create mode 100644 meta-stx-integ/recipes-devtools/python/python-oslo.i18n_%.bbappend
 create mode 100644 meta-stx-integ/recipes-devtools/python/python-oslo.messaging_git.bbappend
 create mode 100644 meta-stx-integ/recipes-devtools/python/python-oslo.rootwrap_git.bbappend
 create mode 100644 meta-stx-integ/recipes-devtools/python/python-oslo.service_git.bbappend
 rename {meta-stx-cloud => meta-stx-integ}/recipes-devtools/python/python-oslo.utils_git.bbappend (84%)
 create mode 100644 meta-stx-integ/recipes-devtools/python/python-pycadf_git.bbappend
 create mode 100644 meta-stx-integ/recipes-devtools/python/python-swiftclient_git.bbappend

diff --git a/meta-stx-cloud/recipes-devtools/python/python-keystoneclient_git.bbappend b/meta-stx-cloud/recipes-devtools/python/python-keystoneclient_git.bbappend
index 1638212..e257cfe 100644
--- a/meta-stx-cloud/recipes-devtools/python/python-keystoneclient_git.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-keystoneclient_git.bbappend
@@ -1,4 +1,3 @@
-
 SRC_URI = "\
 	git://github.com/openstack/python-keystoneclient.git;branch=stable/train \
 	"
@@ -16,3 +15,5 @@ RDEPENDS_${PN}_append = " \
 	keystone-cronjobs \
 	keystone \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-cloud/recipes-devtools/python/python-openstacksdk_git.bbappend b/meta-stx-cloud/recipes-devtools/python/python-openstacksdk_git.bbappend
index 5130b8a..8688389 100644
--- a/meta-stx-cloud/recipes-devtools/python/python-openstacksdk_git.bbappend
+++ b/meta-stx-cloud/recipes-devtools/python/python-openstacksdk_git.bbappend
@@ -7,3 +7,5 @@ RDEPENDS_${PN} += " \
 	python-munch \
 	python2-os-service-types \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-cloud/recipes-support/os-service-types/python2-os-service-types_1.3.0.bb b/meta-stx-cloud/recipes-support/os-service-types/python2-os-service-types_1.3.0.bb
index a6b6a96..d266c87 100644
--- a/meta-stx-cloud/recipes-support/os-service-types/python2-os-service-types_1.3.0.bb
+++ b/meta-stx-cloud/recipes-support/os-service-types/python2-os-service-types_1.3.0.bb
@@ -25,3 +25,5 @@ RDEPENDS_${PN} += " \
         python-requests \
         python-cython \
         "
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-flock/stx-config/cgts-client.bb b/meta-stx-flock/stx-config/cgts-client.bb
index 25e38aa..68796d2 100644
--- a/meta-stx-flock/stx-config/cgts-client.bb
+++ b/meta-stx-flock/stx-config/cgts-client.bb
@@ -20,7 +20,10 @@ RDEPENDS_${PN}_append = " \
 
 inherit setuptools
 
+export PBR_VERSION = "${PV}"
+
 do_install_append() {
        install -d -m 755 ${D}/${sysconfdir}/bash_completion.d
        install -p -D -m 664 tools/system.bash_completion ${D}/${sysconfdir}/bash_completion.d/system.bash_completion
 }
+
diff --git a/meta-stx-flock/stx-config/sysinv.bb b/meta-stx-flock/stx-config/sysinv.bb
index 8e98d4a..8c784b5 100644
--- a/meta-stx-flock/stx-config/sysinv.bb
+++ b/meta-stx-flock/stx-config/sysinv.bb
@@ -77,6 +77,8 @@ USERADD_PACKAGES = "sysinv"
 USERADD_PARAM_sysinv = "-r -g sysinv -u 168 -d /var/lib/sysinv -s /sbin/nologin -c 'sysinv Daemons' sysinv"
 GROUPADD_PARAM_sysinv = "-r -g 168 sysinv"
 
+export PBR_VERSION = "${PV}"
+
 do_install_append() {
 
 	install -d -m 755 ${D}${sysconfdir}/goenabled.d
diff --git a/meta-stx-flock/stx-distributedcloud/distributedcloud-client-dcmanager_git.bb b/meta-stx-flock/stx-distributedcloud/distributedcloud-client-dcmanager_git.bb
index bc8a2f7..2ae4d14 100644
--- a/meta-stx-flock/stx-distributedcloud/distributedcloud-client-dcmanager_git.bb
+++ b/meta-stx-flock/stx-distributedcloud/distributedcloud-client-dcmanager_git.bb
@@ -22,6 +22,8 @@ SRC_URI = " \
 
 inherit distutils python-dir
 
+export PBR_VERSION = "${PV}"
+
 DEPENDS += " \
 	python-pbr-native \
 	"
diff --git a/meta-stx-flock/stx-distributedcloud/distributedcloud_git.bb b/meta-stx-flock/stx-distributedcloud/distributedcloud_git.bb
index 6facb72..8e8d716 100644
--- a/meta-stx-flock/stx-distributedcloud/distributedcloud_git.bb
+++ b/meta-stx-flock/stx-distributedcloud/distributedcloud_git.bb
@@ -72,6 +72,8 @@ RDEPENDS_distributedcloud-dcdbsync+= " ${ALL_RDEPENDS}"
 
 inherit distutils python-dir
 
+export PBR_VERSION = "${PV}"
+
 do_configure() {
 	cd ${S}/distributedcloud
 	distutils_do_configure
diff --git a/meta-stx-flock/stx-fault/python-fmclient.bb b/meta-stx-flock/stx-fault/python-fmclient.bb
index 78f6b2e..8b58882 100644
--- a/meta-stx-flock/stx-fault/python-fmclient.bb
+++ b/meta-stx-flock/stx-fault/python-fmclient.bb
@@ -4,3 +4,5 @@ require fault-common.inc
 
 SUBPATH0 = "python-fmclient/fmclient"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-flock/stx-gui/stx-gui.bb b/meta-stx-flock/stx-gui/stx-gui.bb
index 7eae1b4..acfc95e 100644
--- a/meta-stx-flock/stx-gui/stx-gui.bb
+++ b/meta-stx-flock/stx-gui/stx-gui.bb
@@ -18,6 +18,8 @@ SRC_URI = "git://opendev.org/starlingx/gui.git;protocol=${PROTOCOL};rev=${SRCREV
 
 inherit distutils python-dir
 
+export PBR_VERSION = "${PV}"
+
 DEPENDS = "\
 	python \
 	python-pbr-native \
diff --git a/meta-stx-integ/recipes-devtools/python/python-aodhclient_git.bb b/meta-stx-integ/recipes-devtools/python/python-aodhclient_git.bb
index 0e44e42..11ca535 100644
--- a/meta-stx-integ/recipes-devtools/python/python-aodhclient_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-aodhclient_git.bb
@@ -1,4 +1,3 @@
-
 DESCRIPTION = "client library for Aodh built on the Aodh API"
 HOMEPAGE = "https://launchpad.net/python-aodhclient"
 SECTION = "devel/python"
@@ -46,3 +45,5 @@ do_install_append() {
 
 FILES_${PN} += " \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-barbican_git.bb b/meta-stx-integ/recipes-devtools/python/python-barbican_git.bb
index b96d2c8..fe2f8cb 100644
--- a/meta-stx-integ/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-barbican_git.bb
@@ -25,6 +25,8 @@ S = "${WORKDIR}/git"
 
 inherit update-rc.d setuptools identity hosts useradd default_configs monitor systemd
 
+export PBR_VERSION = "${PV}"
+
 SYSTEMD_SERVICE_${SRCNAME} = " \
 	openstack-barbican-api.service \
 	openstack-barbican-worker.service \
diff --git a/meta-stx-integ/recipes-devtools/python/python-barbicanclient_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-barbicanclient_git.bbappend
index 7f1f006..22d29f6 100644
--- a/meta-stx-integ/recipes-devtools/python/python-barbicanclient_git.bbappend
+++ b/meta-stx-integ/recipes-devtools/python/python-barbicanclient_git.bbappend
@@ -4,3 +4,5 @@ SRCREV = "9c0e02d367b86eb5bdebda4e0ff1434d70db5f61"
 SRC_URI = " \
 	git://github.com/openstack/python-barbicanclient.git;branch=stable/train \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-castellan_git.bb b/meta-stx-integ/recipes-devtools/python/python-castellan_git.bb
index a9fc224..f838b7c 100644
--- a/meta-stx-integ/recipes-devtools/python/python-castellan_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-castellan_git.bb
@@ -16,6 +16,8 @@ SRC_URI = "git://opendev.org/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=$
 
 inherit setuptools
 
+export PBR_VERSION = "${PV}"
+
 DEPENDS += " \
         python-pip \
         python-pbr-native \
diff --git a/meta-stx-integ/recipes-devtools/python/python-cinderclient_git.bb b/meta-stx-integ/recipes-devtools/python/python-cinderclient_git.bb
index 1a4fe1c..9636160 100644
--- a/meta-stx-integ/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-cinderclient_git.bb
@@ -16,6 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${
 
 inherit setuptools
 
+export PBR_VERSION = "${PV}"
+
 DEPENDS += " \
         python-pip \
         python-pbr-native\
diff --git a/meta-stx-integ/recipes-devtools/python/python-glanceclient_git.bb b/meta-stx-integ/recipes-devtools/python/python-glanceclient_git.bb
index 2094e24..d84fdbc 100644
--- a/meta-stx-integ/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-glanceclient_git.bb
@@ -44,3 +44,5 @@ do_install_append() {
 	install -d -m 755 ${D}/${sysconfdir}/bash_completion.d
 	install -p -D -m 664 tools/glance.bash_completion ${D}/${sysconfdir}/bash_completion.d/glance
 }
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-gnocchiclient_7.0.4.bb b/meta-stx-integ/recipes-devtools/python/python-gnocchiclient_7.0.4.bb
index 12c11d2..d87659a 100644
--- a/meta-stx-integ/recipes-devtools/python/python-gnocchiclient_7.0.4.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-gnocchiclient_7.0.4.bb
@@ -20,3 +20,5 @@ DEPENDS += " \
 RDEPENDS_${PN}_append = " python-ujson"
 
 inherit setuptools
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-heatclient_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-heatclient_git.bbappend
index 14f2878..7fc1d52 100644
--- a/meta-stx-integ/recipes-devtools/python/python-heatclient_git.bbappend
+++ b/meta-stx-integ/recipes-devtools/python/python-heatclient_git.bbappend
@@ -4,3 +4,5 @@ SRCREV = "eca16376563c2b0249d5b2aba1f6283a5aebbe98"
 SRC_URI = " \
 	git://github.com/openstack/python-heatclient.git;branch=stable/train \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-ironicclient_git.bb b/meta-stx-integ/recipes-devtools/python/python-ironicclient_git.bb
index 8fb480e..5e06f27 100644
--- a/meta-stx-integ/recipes-devtools/python/python-ironicclient_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-ironicclient_git.bb
@@ -26,3 +26,5 @@ RDEPENDS_${PN}_append = " \
 	python-dogpile.cache \
 	python-oslo.config \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-keystone_git.bb b/meta-stx-integ/recipes-devtools/python/python-keystone_git.bb
index 0b2e348..4a30f37 100644
--- a/meta-stx-integ/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-keystone_git.bb
@@ -25,6 +25,8 @@ inherit setuptools identity hosts default_configs monitor useradd systemd
 
 inherit stx-metadata
 
+export PBR_VERSION = "${PV}"
+
 STX_REPO = "upstream"
 STX_SUBPATH = "openstack/python-keystone/centos"
 
diff --git a/meta-stx-integ/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-stx-integ/recipes-devtools/python/python-keystonemiddleware_git.bb
index 0f688ac..cd3d539 100644
--- a/meta-stx-integ/recipes-devtools/python/python-keystonemiddleware_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-keystonemiddleware_git.bb
@@ -44,3 +44,5 @@ RDEPENDS_${PN} += " \
         python-six \
         python-webob \
         "
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-ldappool_git.bb b/meta-stx-integ/recipes-devtools/python/python-ldappool_git.bb
index a72e6ea..5336e56 100644
--- a/meta-stx-integ/recipes-devtools/python/python-ldappool_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-ldappool_git.bb
@@ -16,3 +16,5 @@ SRC_URI = "git://opendev.org/openstack/ldappool.git;protocol=${PROTOCOL};rev=${S
 
 DEPENDS += " python python-pbr-native"
 inherit setuptools distutils pkgconfig
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-neutronclient_git.bb b/meta-stx-integ/recipes-devtools/python/python-neutronclient_git.bb
index 688cfa2..2039f4d 100644
--- a/meta-stx-integ/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-neutronclient_git.bb
@@ -61,3 +61,5 @@ FILES_${BPN}-bash-completion = "${sysconfdir}/bash_completion.d/*"
 MONITOR_CHECKS_${PN} += "\
 	neutron-api-check.sh \
 "
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-novaclient_git.bb b/meta-stx-integ/recipes-devtools/python/python-novaclient_git.bb
index 039ba1d..c5141b0 100644
--- a/meta-stx-integ/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-novaclient_git.bb
@@ -18,6 +18,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${
 
 inherit setuptools python-dir
 
+export PBR_VERSION = "${PV}"
+
 DEPENDS += " \
         python-pip \
         python-pbr-native \
diff --git a/meta-stx-integ/recipes-devtools/python/python-openstackclient_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-openstackclient_git.bbappend
index eaefd2d..a2ee1db 100644
--- a/meta-stx-integ/recipes-devtools/python/python-openstackclient_git.bbappend
+++ b/meta-stx-integ/recipes-devtools/python/python-openstackclient_git.bbappend
@@ -1,5 +1,3 @@
-
-
 PV = "4.0.0+git${SRCPV}"
 SRCREV = "aa64eb6b0acc6e049c81fd856b75cda2f905c84c"
 
@@ -10,3 +8,5 @@ SRC_URI = " \
 RDEPENDS_${PN}_append = " \
 	python-swiftclient \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-os-client-config_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-os-client-config_git.bbappend
new file mode 100644
index 0000000..be8d426
--- /dev/null
+++ b/meta-stx-integ/recipes-devtools/python/python-os-client-config_git.bbappend
@@ -0,0 +1 @@
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.cache_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.cache_git.bb
index 8d6169a..fdf3920 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.cache_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.cache_git.bb
@@ -34,3 +34,5 @@ RDEPENDS_${PN} += " \
         python-oslo.log \
         python-oslo.utils \
         "
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.concurrency_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.concurrency_git.bb
index 62f486f..c6a2ba9 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.concurrency_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.concurrency_git.bb
@@ -35,3 +35,5 @@ RDEPENDS_${PN} += " \
         python-six \
         python-enum34 \
         "
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.config_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.config_git.bb
index a3cda7f..966ee2b 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.config_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.config_git.bb
@@ -37,4 +37,5 @@ RDEPENDS_${PN} += " \
     python-pyyaml \
     python-importlib-metadata \
     "
-	
+
+export PBR_VERSION = "${PV}"	
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.context_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.context_git.bb
index 5dafb7b..43f3ddf 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.context_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.context_git.bb
@@ -33,3 +33,5 @@ RDEPENDS_${PN} += " \
         python-debtcollector \
         python-positional \
         "
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.db_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.db_git.bb
index 31a8e94..83386f8 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.db_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.db_git.bb
@@ -34,3 +34,5 @@ RDEPENDS_${PN} += " \
 	python-pbr \
 	python-debtcollector \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.i18n_%.bbappend b/meta-stx-integ/recipes-devtools/python/python-oslo.i18n_%.bbappend
new file mode 100644
index 0000000..be8d426
--- /dev/null
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.i18n_%.bbappend
@@ -0,0 +1 @@
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.log_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.log_git.bb
index e83fd43..d3695a1 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.log_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.log_git.bb
@@ -42,3 +42,5 @@ RDEPENDS_${PN} += " \
         python-dateutil \
         python-monotonic \
         "
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.messaging_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-oslo.messaging_git.bbappend
new file mode 100644
index 0000000..be8d426
--- /dev/null
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.messaging_git.bbappend
@@ -0,0 +1 @@
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.middleware_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.middleware_git.bb
index 02e52af..4f0cc5d 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.middleware_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.middleware_git.bb
@@ -40,3 +40,5 @@ RDEPENDS_${PN} += " \
         python-debtcollector \
         python-statsd \
         "
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.policy_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.policy_git.bb
index 6b737a8..c6f768f 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.policy_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.policy_git.bb
@@ -30,3 +30,5 @@ RDEPENDS_${PN} += " \
 	python-pyyaml \
 	python-requests \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.rootwrap_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-oslo.rootwrap_git.bbappend
new file mode 100644
index 0000000..be8d426
--- /dev/null
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.rootwrap_git.bbappend
@@ -0,0 +1 @@
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.serialization_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.serialization_git.bb
index 1ada0ac..89d2a69 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.serialization_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.serialization_git.bb
@@ -37,3 +37,5 @@ RDEPENDS_${PN} += " \
 	python-pytz \
 	python-msgpack \
 	"
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.service_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-oslo.service_git.bbappend
new file mode 100644
index 0000000..be8d426
--- /dev/null
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.service_git.bbappend
@@ -0,0 +1 @@
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.upgradecheck_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.upgradecheck_git.bb
index bede111..f6b779a 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.upgradecheck_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.upgradecheck_git.bb
@@ -22,6 +22,8 @@ S = "${WORKDIR}/git"
 
 inherit setuptools
 
+export PBR_VERSION = "${PV}"
+
 DEPENDS += " \
     python-pip \
     python-pbr-native \
diff --git a/meta-stx-cloud/recipes-devtools/python/python-oslo.utils_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-oslo.utils_git.bbappend
similarity index 84%
rename from meta-stx-cloud/recipes-devtools/python/python-oslo.utils_git.bbappend
rename to meta-stx-integ/recipes-devtools/python/python-oslo.utils_git.bbappend
index 240e37e..464f30f 100644
--- a/meta-stx-cloud/recipes-devtools/python/python-oslo.utils_git.bbappend
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.utils_git.bbappend
@@ -3,3 +3,4 @@ PV = "3.33.0+git${SRCPV}"
 SRCREV = "58fb709f58bd031c5114d9b6fe2e0926175b87b6"
 SRC_URI = "git://github.com/openstack/oslo.utils.git;branch=stable/queens"
 
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-oslo.versionedobjects_git.bb b/meta-stx-integ/recipes-devtools/python/python-oslo.versionedobjects_git.bb
index 3ba522c..a99d6a8 100644
--- a/meta-stx-integ/recipes-devtools/python/python-oslo.versionedobjects_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-oslo.versionedobjects_git.bb
@@ -16,6 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=${
 
 inherit setuptools
 
+export PBR_VERSION = "${PV}"
+
 DEPENDS += " \
         python-pip \
         python-pbr-native \
diff --git a/meta-stx-integ/recipes-devtools/python/python-osprofiler_git.bb b/meta-stx-integ/recipes-devtools/python/python-osprofiler_git.bb
index df8dd7b..73b1d8b 100644
--- a/meta-stx-integ/recipes-devtools/python/python-osprofiler_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-osprofiler_git.bb
@@ -16,6 +16,8 @@ SRC_URI = "git://opendev.org/openstack/${SRCNAME}.git;protocol=${PROTOCOL};rev=$
 	
 inherit setuptools
 
+export PBR_VERSION = "${PV}"
+
 DEPENDS += " python-pbr-native"
 
 RDEPENDS_${PN}_append = " \
diff --git a/meta-stx-integ/recipes-devtools/python/python-pankoclient_git.bb b/meta-stx-integ/recipes-devtools/python/python-pankoclient_git.bb
index 1da4b3f..439ed0f 100644
--- a/meta-stx-integ/recipes-devtools/python/python-pankoclient_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-pankoclient_git.bb
@@ -18,3 +18,5 @@ DEPENDS += " \
 	"
 
 inherit setuptools
+
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-pycadf_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-pycadf_git.bbappend
new file mode 100644
index 0000000..be8d426
--- /dev/null
+++ b/meta-stx-integ/recipes-devtools/python/python-pycadf_git.bbappend
@@ -0,0 +1 @@
+export PBR_VERSION = "${PV}"
diff --git a/meta-stx-integ/recipes-devtools/python/python-redfishtool_git.bb b/meta-stx-integ/recipes-devtools/python/python-redfishtool_git.bb
index 1299c91..aea8c75 100644
--- a/meta-stx-integ/recipes-devtools/python/python-redfishtool_git.bb
+++ b/meta-stx-integ/recipes-devtools/python/python-redfishtool_git.bb
@@ -20,6 +20,8 @@ SRC_URI = " \
 
 inherit setuptools
 
+export PBR_VERSION = "${PV}"
+
 RDEPENDS_${PN} += " \
 	python-requests \
 "
diff --git a/meta-stx-integ/recipes-devtools/python/python-swiftclient_git.bbappend b/meta-stx-integ/recipes-devtools/python/python-swiftclient_git.bbappend
new file mode 100644
index 0000000..be8d426
--- /dev/null
+++ b/meta-stx-integ/recipes-devtools/python/python-swiftclient_git.bbappend
@@ -0,0 +1 @@
+export PBR_VERSION = "${PV}"