Merge "Change registry to rdoproject for older branches"

This commit is contained in:
Zuul 2021-03-30 03:55:46 +00:00 committed by Gerrit Code Review
commit 2f38509ffd
2 changed files with 3 additions and 2 deletions

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', job.alt_container_registry|default('quay.io')) }}"
docker_registry_host: "{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', job.alt_container_registry|default('trunk.registry.rdoproject.org')) }}"
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

View File

@ -19,7 +19,8 @@ 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', job.alt_container_registry|default('quay.io')) }}"
docker_registry_host: >-
"{{ job.build_container_images|default(false)|bool | ternary('127.0.0.1:5001', job.alt_container_registry|default('trunk.registry.rdoproject.org')) }}"
docker_registry_namespace: "tripleo{{ release }}"
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
docker_openshift_tag: v3.11.0