From d88074b6238510daf9b0800efa27d7caccd7f080 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 14 Jun 2023 13:54:53 +0200 Subject: config: switch OpenStack release back to master 2023.1 'Antelope' has stable/ branch so we can go back to master. rocky/centos: mark bifrost unbuildable - EPEL issues - will be fixed separately Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/886395 Change-Id: I523e7465c3cf87ae4ee3fd16b3a79ddb0b707b37 --- kolla/common/config.py | 2 +- kolla/image/unbuildable.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index 86bdcf230..d8eb6846e 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -36,7 +36,7 @@ DISTRO_PRETTY_NAME = { 'rocky': 'Rocky Linux 9.* (Blue Onyx)', 'ubuntu': 'Ubuntu 22.04', } -OPENSTACK_RELEASE = '2023.1' +OPENSTACK_RELEASE = 'master' # This is noarch repository so we will use it on all architectures DELOREAN_DEPS = "" diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index 9ead6ef52..4eb505f47 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -25,6 +25,7 @@ UNBUILDABLE_IMAGES = { # Issues for SHA1 keys: # 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 @@ -37,6 +38,7 @@ UNBUILDABLE_IMAGES = { }, '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 -- cgit v1.2.3