From b71b15167cac4b137667d9c88af6b273df08b072 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Fri, 28 Aug 2020 17:35:03 +0530 Subject: [PATCH] Set openstack namespace for victoria release onwards https://review.opendev.org/747259 switches the container name preffix to openstack for master. In order to make it working for periodic jobs, we moved the var to periodic release file at https://review.opendev.org/#/c/748690/ and for check one, it will take care. Changes in container-build role takes care of provider job. Closes-Bug: #1893339 Depends-On: https://review.opendev.org/#/c/747129/ Change-Id: I56b1570d7580c2592ff9948fae94c170db674a3f Signed-off-by: Chandan Kumar (raukadah) --- roles/container-build/defaults/main.yaml | 5 ++++- roles/extras-common/defaults/main.yml | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/roles/container-build/defaults/main.yaml b/roles/container-build/defaults/main.yaml index 680cd1442..7d4d5b95d 100644 --- a/roles/container-build/defaults/main.yaml +++ b/roles/container-build/defaults/main.yaml @@ -18,8 +18,11 @@ local_registry_ip: 127.0.0.1 local_registry_port: 5001 container_registry_namespace: tripleomaster container_tag: current-tripleo +# Notes(chandankumar): openstack- prefix is used from victoria release onwards docker_prep_prefix: >- - {% if job.build_container_images|default(false)|bool and not job.provider_job|default(false)|bool -%} + {% if (job.build_container_images|default(false)|bool and + not job.provider_job|default(false)|bool) or + release not in ['queens', 'rocky', 'pike', 'stein', 'train', 'ussuri'] -%} openstack {%- else -%} {{ ansible_distribution | lower }}-binary diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml index 26128e84f..1c840cef2 100644 --- a/roles/extras-common/defaults/main.yml +++ b/roles/extras-common/defaults/main.yml @@ -40,11 +40,14 @@ docker_registry_host: docker.io docker_registry_namespace: "tripleo{{ release }}" docker_image_tag: current-tripleo # docker prefix +# Notes(chandankumar): openstack- prefix is used from victoria release onwards docker_prep_prefix: >- - {% if job.build_container_images|default(false)|bool and not job.provider_job|default(false)|bool -%} - openstack- + {% if (job.build_container_images|default(false)|bool and + not job.provider_job|default(false)|bool) or + release not in ['queens', 'rocky', 'pike', 'stein', 'train', 'ussuri'] -%} + openstack {%- else -%} - {{ ansible_distribution | lower }}-binary- + {{ ansible_distribution | lower }}-binary {%- endif -%} # docker suffix docker_prep_suffix: ""