diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-13 14:21:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-13 14:21:17 +0000 |
| commit | 9edcdb0a7ab57764b6e8622e5a75d4a1ecce2515 (patch) | |
| tree | 93fbc2d1cb5ded9a35db5baed3b29a4ac8c48d2a | |
| parent | 684eeab65e88e45adcf6d96eb4b0234fe5ed0e51 (diff) | |
| parent | 1e40f08e6c9d0dc5093d89b1c588b178c2f93e08 (diff) | |
| download | kolla-9edcdb0a7ab57764b6e8622e5a75d4a1ecce2515.tar.gz kolla-9edcdb0a7ab57764b6e8622e5a75d4a1ecce2515.zip | |
Merge "[publishing] use a new naming scheme"
| -rw-r--r-- | .zuul.d/centos.yaml | 1 | ||||
| -rw-r--r-- | .zuul.d/debian.yaml | 1 | ||||
| -rw-r--r-- | .zuul.d/ubuntu.yaml | 1 | ||||
| -rwxr-xr-x | kolla/common/config.py | 5 | ||||
| -rwxr-xr-x | kolla/image/build.py | 5 | ||||
| -rw-r--r-- | tests/playbooks/run.yml | 3 |
6 files changed, 13 insertions, 3 deletions
diff --git a/.zuul.d/centos.yaml b/.zuul.d/centos.yaml index 9f8a1f4e9..4d68236ec 100644 --- a/.zuul.d/centos.yaml +++ b/.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 diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml index acfac01ea..cff43d4b5 100644 --- a/.zuul.d/debian.yaml +++ b/.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 diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 19702db4d..12586e4e8 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.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 diff --git a/kolla/common/config.py b/kolla/common/config.py index ef5f70fd1..faad3576f 100755 --- a/kolla/common/config.py +++ b/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 = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index ee0aaaf73..a186ba4b8 100755 --- a/kolla/image/build.py +++ b/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() diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml index 9b544b30f..d3d22e14f 100644 --- a/tests/playbooks/run.yml +++ b/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: |