openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Modified container exclude list with distros"

Browse Source
This commit is contained in:
Zuul 2021-10-21 05:09:55 +00:00 committed by Gerrit Code Review
commit 98c50fb2b0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/container-build/defaults/main.yaml
View File

@ -32,3 +32,4 @@ docker_prep_prefix: >-
containers_base_image: "{{ job.containers_base_image|default('ubi8') }}" containers_base_image: "{{ job.containers_base_image|default('ubi8') }}"
container_registry_image: quay.io/tripleoci/registry:2 container_registry_image: quay.io/tripleoci/registry:2
container_registry_image_fallback: trunk.registry.rdoproject.org/ceph/registry:2 container_registry_image_fallback: trunk.registry.rdoproject.org/ceph/registry:2
container_exclude_distro: "{{ ansible_distribution|lower }}{{ ansible_distribution_major_version}}"

2
roles/container-build/tasks/main.yaml
View File

@ -116,7 +116,7 @@
tripleo_container_image_build_prefix: "{{ docker_prep_prefix }}" tripleo_container_image_build_prefix: "{{ docker_prep_prefix }}"
tripleo_container_image_build_timeout: 10000 tripleo_container_image_build_timeout: 10000
tripleo_container_image_build_base: "{{ containers_base_image }}" tripleo_container_image_build_base: "{{ containers_base_image }}"
tripleo_container_image_build_excludes: "{{ exclude_containers[branch]|default([]) }}" tripleo_container_image_build_excludes: "{{ exclude_containers[branch][container_exclude_distro]|default([]) }}"
tripleo_container_image_build_tcib_extras: "{{ tcib_extras | default([]) }}" tripleo_container_image_build_tcib_extras: "{{ tcib_extras | default([]) }}"
tripleo_container_image_build_distro: "{{ (ansible_distribution == 'RedHat') | ternary('rhel', 'centos') }}" tripleo_container_image_build_distro: "{{ (ansible_distribution == 'RedHat') | ternary('rhel', 'centos') }}"