diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-08 11:27:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-08 11:27:57 +0000 |
| commit | 5c408713952617b5d1b9e216cf2b8bb305e83a1b (patch) | |
| tree | b0c611e455dde9f299a831bcb8516b4e0d28cc1c | |
| parent | fdd77ec9a31929e60da8ec711e87b7528e7531e1 (diff) | |
| parent | 1d5e1a391522ef01efc4a16ad0e2ae9c99752b1b (diff) | |
| download | kolla-5c408713952617b5d1b9e216cf2b8bb305e83a1b.tar.gz kolla-5c408713952617b5d1b9e216cf2b8bb305e83a1b.zip | |
Merge "Revert "Disable build of Gnocchi containers"" into stable/zed
| -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 }, } |