Merge "Mark bifrost as buildable and build containers from correct tarballs" into unmaintained/yoga

This commit is contained in:
Zuul 2024-02-29 13:24:59 +00:00 committed by Gerrit Code Review
commit 375a2f603d
2 changed files with 1 additions and 2 deletions
kolla

@ -1038,7 +1038,7 @@ def parse(conf, args, usage=None, prog=None,
# NOTE(jeffrey4l): set the default base tag based on the
# base option
conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag'])
prefix = '' if conf.openstack_release == 'master' else 'stable-'
prefix = '' if conf.openstack_release == 'master' else 'unmaintained-'
openstack_branch = '{}{}'.format(prefix, conf.openstack_release)
openstack_branch_slashed = openstack_branch.replace('-', '/')
conf.set_default('openstack_branch', openstack_branch)

@ -99,7 +99,6 @@ UNBUILDABLE_IMAGES = {
},
'source': {
"bifrost-base", # Broken on unmaintained/yoga
},
'centos': {