Skip to content

Commit 285c56c

Browse files
committed
CI: Stop using infra cache servers as registry
We are seeing frequent CI job failures due to timeouts while fetching container images. See similar change in kolla-ansible [1]. Also remove the kolla_docker_namespace variable from CI overrides: "openstack.kolla" has been the default value since 2021 [2]. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/967159 [2] https://review.opendev.org/c/openstack/kayobe/+/812947 Change-Id: I27ba36000d4f5842f27fc49230314fd54e434dcb Signed-off-by: Pierre Riteau <pierre@stackhpc.com> (cherry picked from commit 88f30f2)
1 parent 74568bd commit 285c56c

4 files changed

Lines changed: 0 additions & 12 deletions

File tree

playbooks/kayobe-overcloud-base/overrides.yml.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ docker_daemon_debug: true
44
docker_registry_mirrors:
55
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
66

7-
kolla_docker_namespace: "openstack.kolla"
8-
# use the published images from a site mirror of quay.io
9-
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
107
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
118
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
129
kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"

playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ docker_daemon_debug: true
44
docker_registry_mirrors:
55
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
66

7-
kolla_docker_namespace: "openstack.kolla"
8-
# use the published images from a site mirror of quay.io
9-
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
107
{% if not is_previous_release | default(false) %}
118
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
129
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"

playbooks/kayobe-seed-base/overrides.yml.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ docker_daemon_debug: true
44
docker_registry_mirrors:
55
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
66

7-
kolla_docker_namespace: "openstack.kolla"
8-
# use the published images from a site mirror of quay.io
9-
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
107
# NOTE(mgoddard): The kolla repository is copied to /tmp/kolla and made
118
# readable by the stack user.
129
kolla_source_url: "/tmp/kolla"

playbooks/kayobe-seed-upgrade-base/overrides.yml.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ docker_daemon_debug: true
44
docker_registry_mirrors:
55
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
66

7-
kolla_docker_namespace: "openstack.kolla"
8-
# use the published images from a site mirror of quay.io
9-
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
107
{% if not is_previous_release | default(false) %}
118
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
129
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"

0 commit comments

Comments
 (0)