diff options
| author | Chris Evich <cevich@redhat.com> | 2020-10-08 09:08:19 -0400 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2020-10-28 12:25:53 -0600 |
| commit | 53fe386da047cce6a9e9f381b2dd73335babe305 (patch) | |
| tree | e9f6edd6be4336a9a8a87e6da1abc4ecc225763c | |
| parent | 5d48606dae9c833869c23ab86edd55a7f9fbf85d (diff) | |
| download | podman-53fe386da047cce6a9e9f381b2dd73335babe305.tar.gz podman-53fe386da047cce6a9e9f381b2dd73335babe305.tar.bz2 podman-53fe386da047cce6a9e9f381b2dd73335babe305.zip | |
Cirrus: Use google mirror for docker.io
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | contrib/cirrus/lib.sh | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 2 | ||||
| -rw-r--r-- | test/registries.conf | 21 |
3 files changed, 17 insertions, 7 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index e5124d8e4..8c86925d8 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -208,6 +208,7 @@ install_test_configs() { # as the default). This config prevents allocation of network address space used # by default in google cloud. https://cloud.google.com/vpc/docs/vpc#ip-ranges install -v -D -m 644 $SCRIPT_BASE/99-do-not-use-google-subnets.conflist /etc/cni/net.d/ + install -v -D -m 644 ./test/registries.conf /etc/containers/ } diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 3135a5e65..0f9bf4054 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -178,6 +178,8 @@ case "$TEST_FLAVOR" in remove_packaged_podman_files make install PREFIX=/usr ETCDIR=/etc fi + + install_test_configs ;; vendor) make clean ;; release) ;; diff --git a/test/registries.conf b/test/registries.conf index f27a282d6..0559c9e52 100644 --- a/test/registries.conf +++ b/test/registries.conf @@ -1,10 +1,17 @@ # Note that changing the order here may break tests. -[registries.search] -registries = ['docker.io', 'quay.io', 'registry.fedoraproject.org'] +unqualified-search-registries = ['docker.io', 'quay.io', 'registry.fedoraproject.org'] -[registries.insecure] -registries = [] +[[registry]] +# In Nov. 2020, Docker rate-limits image pulling. To avoid hitting these +# limits while testing, always use the google mirror for qualified and +# unqualified `docker.io` images. +# Ref: https://cloud.google.com/container-registry/docs/pulling-cached-images +prefix="docker.io" +location="mirror.gcr.io" -#blocked (docker only) -[registries.block] -registries = [] +# 2020-10-27 a number of images are not present in gcr.io, and podman +# barfs spectacularly when trying to fetch them. We've hand-copied +# those to quay, using skopeo copy --all ... +[[registry]] +prefix="docker.io/library" +location="quay.io/libpod" |