From 1ab6cabc9d5e07f3ecf508a0fba9a9cc0e1261c6 Mon Sep 17 00:00:00 2001
From: albailey <Al.Bailey@windriver.com>
Date: Wed, 3 Aug 2022 12:46:55 -0400
Subject: [PATCH] python-gnocchiclient build fix (7.0.7)

Lock down python-gnocchiclient to tag 7.0.7

The master branch changed the setup.py which breaks how
the build and install ignore the subdirectories (like v1
or tests).  Tag 7.0.7 does not include that breakage.

Closes-bug: 1983389

Signed-off-by: albailey <Al.Bailey@windriver.com>
Change-Id: Ie5d4596b466e6d8f7c1f35a97c71e24e9acdbb66
---
 default.xml | 4 ++--
 distro.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/default.xml b/default.xml
index 0b536b0..b0bc6a8 100644
--- a/default.xml
+++ b/default.xml
@@ -76,8 +76,8 @@
   <project remote="openstack"  revision="stable/train" name="openstacksdk.git" path="cgcs-root/stx/git/python-openstacksdk"/>
   <project remote="openstack"  revision="stable/train" name="python-pankoclient.git" path="cgcs-root/stx/git/python-pankoclient"/>
 
-  <!-- Last known good build of python-gnochiclient, we were tracking master branch, This SHA is shortly after tag 7.0.7  -->
-  <project remote="gnocchi"    revision="afcf9900fe47f3d8c833eb9b8d62564cea1e7f25" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
+  <!-- Last known good build of python-gnochiclient, 7.0.7 tag -->
+  <project remote="gnocchi"    revision="refs/tags/7.0.7" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
 
   <!-- linux-yocto Upstream branch is v5.10/standard/base, commit 6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15 is Merge tag 'v5.10.112' into v5.10/standard/base -->
   <project remote="linux-yocto"    sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>
diff --git a/distro.xml b/distro.xml
index d6eef08..4cefeaf 100644
--- a/distro.xml
+++ b/distro.xml
@@ -37,8 +37,8 @@
   <project remote="openstack"  revision="stable/train" name="openstacksdk.git" path="cgcs-root/stx/git/python-openstacksdk"/>
   <project remote="openstack"  revision="stable/train" name="python-pankoclient.git" path="cgcs-root/stx/git/python-pankoclient"/>
 
-  <!-- Last known good build of python-gnochiclient, we were tracking master branch, This SHA is shortly after tag 7.0.7  -->
-  <project remote="gnocchi"    revision="afcf9900fe47f3d8c833eb9b8d62564cea1e7f25" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
+  <!-- Last known good build of python-gnochiclient, 7.0.7 tag -->
+  <project remote="gnocchi"    revision="refs/tags/7.0.7" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
 
   <!-- linux-yocto Upstream branch is v5.10/standard/base, commit 6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15 is Merge tag 'v5.10.112' into v5.10/standard/base -->
   <project remote="linux-yocto"    sync-c="true" sync-tags="false" upstream="v5.10/standard/base" revision="6cf7dea05bd756513cf58c5ced8c6bf1d1f23c15" name="linux-yocto" path="cgcs-root/stx/git/linux-yocto-std"/>