From 3381b58fbd9067968c37098c90c9fb71f9305819 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 15 Mar 2022 16:05:47 -0700 Subject: [PATCH] Use deb-docker mirror for upload image too Upload is based on build, since it builds and uploads for the gate. This means we need to add the mirror here too, so that we're installing docker from the deb mirror. We convert to https at the same time for both jobs. Change-Id: Ie1ff253e6cfc3e666a4e6be919a08f3a5d041319 --- zuul.d/docker-images/base.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zuul.d/docker-images/base.yaml b/zuul.d/docker-images/base.yaml index 79648fb527..f3d962bfc7 100644 --- a/zuul.d/docker-images/base.yaml +++ b/zuul.d/docker-images/base.yaml @@ -21,7 +21,7 @@ dependencies: opendev-buildset-registry abstract: true vars: - docker_mirror_base_url: "http://{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }}" + docker_mirror_base_url: "https://{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }}" zuul_work_dir: "{{ zuul.projects['opendev.org/opendev/system-config'].src_dir }}" - job: @@ -30,6 +30,7 @@ dependencies: opendev-buildset-registry abstract: true vars: + docker_mirror_base_url: "https://{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }}" zuul_work_dir: "{{ zuul.projects['opendev.org/opendev/system-config'].src_dir }}" secrets: name: docker_credentials