add a way to not have 'install_type' in image name (temporary)

--use-short-names argument drops 'install_type' from image names:

kolla/debian-openstack-base:14.1.0

This should allow to get rid of '-source' in image names without
disrupting CI jobs.

Switch publish jobs to use short names so k-a tests will have ready to
use images for both long and short names.

Change-Id: I29c9d51f4b518a4e2d3157ab5d6cc434fb83f2ef
This commit is contained in:
Marcin Juszkiewicz
2022-04-19 13:21:25 +02:00
parent 0cf5b1d4e6
commit e877556aaf
3 changed files with 10 additions and 3 deletions

View File

@@ -248,7 +248,10 @@ _CLI_OPTS = [
cfg.BoolOpt('enable-unbuildable', default=False,
help='Enable images marked as unbuildable'),
cfg.BoolOpt('summary', default=True,
help='Show summary at the end of build')
help='Show summary at the end of build'),
cfg.BoolOpt('use-short-names', default=False,
help='Use image names without install_type '
'(transition option - to be removed)')
]
_BASE_OPTS = [

View File

@@ -647,8 +647,10 @@ class KollaWorker(object):
self.clean_package_cache = self.conf.clean_package_cache
# TODO(hrw): to remove "source-" in a later patch
self.image_prefix = self.base + '-source-'
if self.conf.use_short_names:
self.image_prefix = self.base + '-'
else:
self.image_prefix = self.base + '-source-'
self.regex = conf.regex
self.image_statuses_bad = dict()

View File

@@ -28,6 +28,8 @@
DEFAULT:
namespace: "{{ kolla_namespace }}"
tag: "{{ (zuul.branch | basename) ~ tag_suffix }}"
# NOTE(hrw): we want to publish short names
use_short_names: true
set_fact:
kolla_build_config: "{{ kolla_build_config | combine(kolla_publisher_config, recursive=True) }}"
when: