From 3354572e1e599f5f07c9968eb8b4b5e035a96086 Mon Sep 17 00:00:00 2001 From: Amol Kahat Date: Tue, 22 Nov 2022 13:46:37 +0530 Subject: [PATCH] Remove trunk.registry from tripleo-quickstart-extras repo trunk.registry.rdoproject.org going to decomission soon. This patch will replace trunk.registry to quay.rdoproject.org. Signed-off-by: Amol Kahat Change-Id: I7eb7b8dac1c17ba0eaba8cac12861a18224fac30 --- roles/container-build/defaults/main.yaml | 2 +- roles/container-build/tasks/non_tripleo_containers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/container-build/defaults/main.yaml b/roles/container-build/defaults/main.yaml index 2c960369c..113dd9959 100644 --- a/roles/container-build/defaults/main.yaml +++ b/roles/container-build/defaults/main.yaml @@ -31,7 +31,7 @@ docker_prep_prefix: >- # Temporary pin to 8.2 because of LP #1902846 containers_base_image: "{{ job.containers_base_image|default('ubi8') }}" container_registry_image: quay.io/tripleoci/registry:2 -container_registry_image_fallback: trunk.registry.rdoproject.org/ceph/registry:2 +container_registry_image_fallback: quay.rdoproject.org/ceph/registry:2 container_exclude_distro: "{{ ansible_distribution|lower }}{{ ansible_distribution_major_version}}" # Extra config needs to be passed to tcib tool # https://docs.openstack.org/tripleo-ansible/latest/roles/role-tripleo_container_image_build.html#r-o-l-e-d-e-f-a-u-l-t-s diff --git a/roles/container-build/tasks/non_tripleo_containers.yml b/roles/container-build/tasks/non_tripleo_containers.yml index afc85ed03..df0ca720e 100644 --- a/roles/container-build/tasks/non_tripleo_containers.yml +++ b/roles/container-build/tasks/non_tripleo_containers.yml @@ -52,7 +52,7 @@ - name: Pull failed containers from RDO registry become: true - command: "podman pull docker://trunk.registry.rdoproject.org/ceph/{{ item.split('/')[-1] }}" + command: "podman pull docker://quay.rdoproject.org/ceph/{{ item.split('/')[-1] }}" register: rdo_pull_success ignore_errors: true loop: "{{ missing_containers }}"