diff options
| author | Maksim Malchuk <maksim.malchuk@gmail.com> | 2023-08-02 10:50:46 +0300 |
|---|---|---|
| committer | Maksim Malchuk <maksim.malchuk@gmail.com> | 2023-09-05 12:07:35 +0000 |
| commit | 1d5e1a391522ef01efc4a16ad0e2ae9c99752b1b (patch) | |
| tree | 8bbd9153f3371e5e1f73c945f3aa1e4799c132d1 | |
| parent | 4c5889b68d5185a9c5fa1e2ce2cf2517b0897b01 (diff) | |
| download | kolla-1d5e1a391522ef01efc4a16ad0e2ae9c99752b1b.tar.gz kolla-1d5e1a391522ef01efc4a16ad0e2ae9c99752b1b.zip | |
Revert "Disable build of Gnocchi containers"
This reverts commit 5505cd000ce7f12c272c5b62074c9cc6bf1bb7a7.
Reason: Closed #1304 [1] as completed.
Branch stable/4.4 is taged 4.4.4 with Fix [2] already.
1. https://github.com/gnocchixyz/gnocchi/issues/1304
2. https://github.com/gnocchixyz/gnocchi/commit/1336d930c18ce16c67d7542bf4c1e99358486a4d
Change-Id: I3ca4e10508c26b752412789502ceb917ecb4dbeb
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
(cherry picked from commit 4e5e508282dfd40a7d7831217e109a055073bd7c)
| -rw-r--r-- | kolla/common/sources.py | 2 | ||||
| -rw-r--r-- | kolla/image/unbuildable.py | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/kolla/common/sources.py b/kolla/common/sources.py index e7a72cd2f..2393f955e 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.4.2', + 'reference': '4.4.4', 'location': ('https://github.com/gnocchixyz/' 'gnocchi.git')}, 'heat-base': { diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index 12f0e83c1..e90a9b3d3 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -17,7 +17,6 @@ UNBUILDABLE_IMAGES = { 'aarch64': { "bifrost-base", # someone need to get upstream working first - "gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304 # noqa "prometheus-msteams", # no aarch64 binary "prometheus-mtail", # no aarch64 binary "skydive-base", # no aarch64 binary @@ -26,7 +25,6 @@ UNBUILDABLE_IMAGES = { # Issues for SHA1 keys: # https://github.com/grafana/grafana/issues/41036 'centos': { - "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,11 +32,9 @@ UNBUILDABLE_IMAGES = { }, 'debian': { - "gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304 }, 'rocky': { - "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': { "bifrost-base", # Failing on new efi shim file location - "gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304 "collectd", # Missing collectd-core package "telegraf", # Missing collectd-core package }, 'ubuntu+aarch64': { "barbican-base", # https://github.com/unbit/uwsgi/issues/2434 - "gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304 }, 'centos+aarch64': { - "gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304 "telegraf", # no binary package }, } |