openstack
/
tripleo-ci
Code Issues Proposed changes

Remove trunk.registry from tripleo-ci repo 

trunk.registry.rdoproject.org going to decomission
soon. This patch remove trunk.registry from
tripleo-ci repo.

This patch also removes Dockerfile_rhui.j2 template,
which is used internally. No need to keep it in the
upstream.

Signed-off-by: Amol Kahat <amolkahat@gmail.com>
Change-Id: I11bc7cc37af6271fac7c651c8598a741cf0af783
This commit is contained in:
Amol Kahat 2022-11-22 13:42:16 +05:30
parent b1dfa67c45
commit 25042c4cba
No known key found for this signature in database
GPG Key ID: FDD3BA6C832D7715
10 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/build-containers/tasks/main.yaml
View File

@ -163,12 +163,6 @@
{% endif %}
chown -R {{ ansible_user }}: /tmp/base-build/repos/*
- name: render dockerfile rhui
when: zuul_internal is undefined
template:
src: templates/Dockerfile_rhui.j2
dest: /tmp/base-build/Dockerfile
- name: render dockerfile zuul_internal
when: zuul_internal is defined
template:
@ -291,7 +285,7 @@
$(command -v docker || command -v podman) run -d \
-e REGISTRY_HTTP_ADDR=0.0.0.0:{{ provider_registry_port }} \
-p {{ provider_registry_port }}:{{ provider_registry_port }} \
--name registry trunk.registry.rdoproject.org/ceph/registry:2
--name registry quay.rdoproject.org/ceph/registry:2
changed_when: true
become: true

4
roles/build-containers/templates/Dockerfile_rhui.j2
View File

@ -1,4 +0,0 @@
FROM trunk.registry.rdoproject.org/rhel/rhel8-rhui:8.0-126
RUN rm -f /etc/yum.repos.d/delorean*
COPY repos/delorean* /etc/yum.repos.d/
RUN dnf clean all

4
toci-quickstart/config/testenv/multinode-ibm.yml
View File

@ -46,11 +46,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
{%- if ansible_distribution|lower in ["centos"] -%}
quay.rdoproject.org
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}
{%- endif -%}
# Container update settings

4
toci-quickstart/config/testenv/multinode-psi.yml
View File

@ -48,11 +48,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
{%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
quay.rdoproject.org
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}
{%- endif -%}
# Container update settings

4
toci-quickstart/config/testenv/multinode-rdocloud.yml
View File

@ -49,11 +49,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
{%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
quay.rdoproject.org
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}
{%- endif -%}
# Container settings are set in release files

4
toci-quickstart/config/testenv/multinode-vexxhost.yml
View File

@ -59,11 +59,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
{%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
quay.rdoproject.org
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}
{%- endif -%}
# Container update settings

4
toci-quickstart/config/testenv/ovb-ibm.yml
View File

@ -33,11 +33,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
{%- if ansible_distribution|lower in ["centos"] -%}
quay.rdoproject.org
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}
{%- endif -%}
# build-test packages

4
toci-quickstart/config/testenv/ovb-psi.yml
View File

@ -33,11 +33,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
{%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
quay.rdoproject.org
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}
{%- endif -%}
# build-test packages

4
toci-quickstart/config/testenv/ovb-rdocloud.yml
View File

@ -34,11 +34,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
{%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
quay.rdoproject.org
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}
{%- endif -%}
# build-test packages

4
toci-quickstart/config/testenv/ovb-vexxhost.yml
View File

@ -36,11 +36,7 @@ docker_registry_host: >-
{%- elif job.consumer_job | default(false) | bool -%}
{{ job.registry_ip_address_branch[release] }}:5001
{%- else -%}
{%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
quay.rdoproject.org
{%- else -%}
trunk.registry.rdoproject.org
{%- endif -%}
{%- endif -%}
# build-test packages