openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Support alternative container registry for jobs"

This commit is contained in:
Zuul 2021-03-29 11:04:21 +00:00 committed by Gerrit Code Review
parent ed080a8d5b e0b3a7f329
commit 1af54a7078
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/release/tripleo-ci/CentOS-7/queens.yml
View File

@ -16,7 +16,7 @@ inject_images:
release: queens
dlrn_hash_tag: "{{ job.provider_dlrn_hash_tag_branch[release]|default('current-tripleo') }}"
dlrn_hash_tag_newest: current
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', 'docker.io') }}"
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', job.alt_container_registry|default('docker.io')) }}"
docker_registry_namespace: tripleoqueens
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
overcloud_image_url: https://images.rdoproject.org/queens/rdo_trunk/current-tripleo/overcloud-full.tar

2
config/release/tripleo-ci/CentOS-7/rocky.yml
View File

@ -16,7 +16,7 @@ inject_images:
release: rocky
dlrn_hash_tag: current-tripleo
dlrn_hash_tag_newest: current
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', 'quay.io') }}"
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', job.alt_container_registry|default('quay.io')) }}"
docker_registry_namespace: tripleorocky
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
overcloud_image_url: https://images.rdoproject.org/rocky/rdo_trunk/current-tripleo/overcloud-full.tar

2
config/release/tripleo-ci/CentOS-7/stein.yml
View File

@ -19,7 +19,7 @@ distro_deps_repo_name: deps
dlrn_hash_tag: current-tripleo
dlrn_hash_tag_newest: current
dlrn_baseurl: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}"
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', 'quay.io') }}"
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', job.alt_container_registry|default('quay.io')) }}"
docker_registry_namespace: "tripleo{{ release }}"
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
docker_openshift_tag: v3.11.0

2
config/release/tripleo-ci/CentOS-7/train.yml
View File

@ -20,7 +20,7 @@ distro_deps_repo_name: deps
dlrn_hash_tag: "{{ job.provider_dlrn_hash_tag_branch[release]|default('current-tripleo') }}"
dlrn_hash_tag_newest: current
dlrn_baseurl: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}"
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', 'docker.io') }}"
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', job.alt_container_registry|default('docker.io')) }}"
docker_registry_namespace: "tripleo{{ release }}"
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
docker_openshift_tag: v3.11.0

2
config/release/tripleo-ci/CentOS-8/master.yml
View File

@ -20,7 +20,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
docker.io
{{ job.alt_container_registry|default('docker.io') }}
{%- endif -%}
docker_registry_namespace: "tripleo{{ release }}"
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"

2
config/release/tripleo-ci/CentOS-8/train.yml
View File

@ -14,7 +14,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
docker.io
{{ job.alt_container_registry|default('docker.io') }}
{%- endif -%}
docker_registry_namespace: tripleotraincentos8
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"

2
config/release/tripleo-ci/CentOS-8/ussuri.yml
View File

@ -17,7 +17,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
docker.io
{{ job.alt_container_registry|default('docker.io') }}
{%- endif -%}
# note.. namespace tripleoussuri has been
# squatted on by another owner

2
config/release/tripleo-ci/CentOS-8/victoria.yml
View File

@ -21,7 +21,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
docker.io
{{ job.alt_container_registry|default('docker.io') }}
{%- endif -%}
docker_registry_namespace: "tripleo{{ release }}"
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"