diff options
| author | Zuul <zuul@review.opendev.org> | 2023-08-04 15:52:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-08-04 15:52:13 +0000 |
| commit | 7f12d216dc4de2c8d32291c3d6223185ecf2b510 (patch) | |
| tree | 0556c761d8d1adc1e965a2e251be8b2207736e0b | |
| parent | bd68acb60fe850534541347d7d44091927c5f416 (diff) | |
| parent | 4e5e508282dfd40a7d7831217e109a055073bd7c (diff) | |
| download | kolla-7f12d216dc4de2c8d32291c3d6223185ecf2b510.tar.gz kolla-7f12d216dc4de2c8d32291c3d6223185ecf2b510.zip | |
Merge "Revert "Disable build of Gnocchi containers""
| -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 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 }, } |