Merge "Remove trunk.registry from tripleo-ci repo"
This commit is contained in:
commit
7b7739fbbf
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue