Merge "[publishing] use a new naming scheme"

.zuul.d/centos.yaml

@@ -57,6 +57,7 @@
     nodeset: kolla-centos8-stream
     vars:
       base_distro: centos
+      base_distro_version: stream8
 
 - job:
     name: kolla-build-centos8s-aarch64

.zuul.d/debian.yaml

@@ -35,6 +35,7 @@
     nodeset: kolla-debian-bullseye
     vars:
       base_distro: debian
+      base_distro_version: bullseye
 
 - job:
     name: kolla-build-debian-aarch64

.zuul.d/ubuntu.yaml

@@ -55,6 +55,7 @@
     nodeset: kolla-ubuntu-focal
     vars:
       base_distro: ubuntu
+      base_distro_version: focal
 
 - job:
     name: kolla-build-ubuntu-aarch64

kolla/common/config.py

@@ -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-new-naming-scheme', default=False,
+                help='Use the new naming scheme (transitional option, '
+                'not to be set by end users)'),
 ]
 
 _BASE_OPTS = [

kolla/image/build.py

@@ -647,7 +647,10 @@ class KollaWorker(object):
 
         self.clean_package_cache = self.conf.clean_package_cache
 
-        self.image_prefix = self.base + '-'
+        if self.conf.use_new_naming_scheme:
+            self.image_prefix = ''
+        else:
+            self.image_prefix = self.base + '-'
 
         self.regex = conf.regex
         self.image_statuses_bad = dict()

tests/playbooks/run.yml

@@ -27,7 +27,8 @@
         kolla_publisher_config:
           DEFAULT:
             namespace: "{{ kolla_namespace }}"
-            tag: "{{ (zuul.branch | basename) ~ tag_suffix }}"
+            tag: "{{ (zuul.branch | basename) ~ base_distro ~ base_distro_version ~ tag_suffix }}"
+            use_new_naming_scheme: true
       set_fact:
         kolla_build_config: "{{ kolla_build_config | combine(kolla_publisher_config, recursive=True) }}"
       when: