From 4e5e508282dfd40a7d7831217e109a055073bd7c Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Wed, 2 Aug 2023 10:50:46 +0300
Subject: Revert "Disable build of Gnocchi containers"

This reverts commit 5505cd000ce7f12c272c5b62074c9cc6bf1bb7a7.
Reason: Closed #1304 [1] as completed.
Also build from master until new tag releases since #1304 fixed
in master [2] only.

1. https://github.com/gnocchixyz/gnocchi/issues/1304
2. https://github.com/gnocchixyz/gnocchi/commit/b52f7414d595e8d765fde50992f2776a77b98de6

Change-Id: I3ca4e10508c26b752412789502ceb917ecb4dbeb
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
---
 kolla/common/sources.py    | 2 +-
 kolla/image/unbuildable.py | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index 4ee06a4e1..ec2e7a70b 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -65,7 +65,7 @@ SOURCES = {
                      'glance-${openstack_branch}.tar.gz')},
     'gnocchi-base': {
         'type': 'git',
-        'reference': '4.5.0',
+        'reference': 'master',  # TODO(mmalchuk) change to >4.5.0 when released
         'location': ('https://github.com/gnocchixyz/'
                      'gnocchi.git')},
     'heat-base': {
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
index 4eb505f47..58327ca4d 100644
--- a/kolla/image/unbuildable.py
+++ b/kolla/image/unbuildable.py
@@ -16,7 +16,6 @@
 # must match for skip to happen.
 UNBUILDABLE_IMAGES = {
     'aarch64': {
-        "gnocchi-base",        # https://github.com/gnocchixyz/gnocchi/issues/1304 # noqa
         "bifrost-base",        # someone need to get upstream working first
         "prometheus-msteams",  # no aarch64 binary
         "prometheus-mtail",    # no aarch64 binary
@@ -26,7 +25,6 @@ UNBUILDABLE_IMAGES = {
     # https://github.com/grafana/grafana/issues/41036
     'centos': {
         "bifrost-base",          # EPEL-related breakage
-        "gnocchi-base",          # https://github.com/gnocchixyz/gnocchi/issues/1304 # noqa
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
@@ -34,12 +32,10 @@ UNBUILDABLE_IMAGES = {
     },
 
     'debian': {
-        "gnocchi-base",  # https://github.com/gnocchixyz/gnocchi/issues/1304
     },
 
     'rocky': {
         "bifrost-base",          # EPEL-related breakage
-        "gnocchi-base",          # https://github.com/gnocchixyz/gnocchi/issues/1304 # noqa
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
@@ -47,18 +43,15 @@ UNBUILDABLE_IMAGES = {
     },
 
     'ubuntu': {
-        "gnocchi-base",  # https://github.com/gnocchixyz/gnocchi/issues/1304
         "collectd",      # Missing collectd-core package
         "telegraf",      # Missing collectd-core package
     },
 
     'ubuntu+aarch64': {
-        "gnocchi-base",   # https://github.com/gnocchixyz/gnocchi/issues/1304
         "barbican-base",  # https://github.com/unbit/uwsgi/issues/2434
     },
 
     'centos+aarch64': {
-        "gnocchi-base",  # https://github.com/gnocchixyz/gnocchi/issues/1304
         "telegraf",      # no binary package
     },
 }
-- 
cgit v1.2.3