Skip to content

Commit

Permalink
Fix pulling from docker-hub in CI
Browse files Browse the repository at this point in the history
The docker-hub applies a restrictive pull rate limit based on calling
IP.  Since we cannot predict reuse of IP addresses in CI, using this
repo will flake like crazy.  Rework changes made in
beae564 to use the quay.io registry
instead.

Signed-off-by: Chris Evich <cevich@redhat.com>
  • Loading branch information
cevich committed May 30, 2023
1 parent 47332ce commit 9a9036c
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion tests/conformance/README.md
Expand Up @@ -20,7 +20,7 @@ First, pull base images used by various conformance tests:
bash
docker pull alpine
docker pull busybox
docker pull docker.io/library/centos:centos7
docker pull quay.io/centos/centos:centos7
```

Then you can run all of the tests with go test:
Expand Down
2 changes: 1 addition & 1 deletion tests/conformance/testdata/Dockerfile.reusebase
@@ -1,4 +1,4 @@
FROM docker.io/library/centos:centos7 AS base
FROM quay.io/centos/centos:centos7 AS base
RUN touch -t 201701261659.13 /1
ENV LOCAL=/1

Expand Down
2 changes: 1 addition & 1 deletion tests/conformance/testdata/Dockerfile.shell
@@ -1,3 +1,3 @@
FROM docker.io/library/centos:centos7
FROM quay.io/centos/centos:centos7
SHELL ["/bin/bash", "-xc"]
RUN env
2 changes: 1 addition & 1 deletion tests/conformance/testdata/copy/Dockerfile
@@ -1,3 +1,3 @@
FROM docker.io/library/centos:centos7
FROM quay.io/centos/centos:centos7
COPY script /usr/bin
RUN ls -al /usr/bin/script
2 changes: 1 addition & 1 deletion tests/conformance/testdata/copydir/Dockerfile
@@ -1,3 +1,3 @@
FROM docker.io/library/centos:centos7
FROM quay.io/centos/centos:centos7
COPY dir /dir
RUN ls -al /dir/file
2 changes: 1 addition & 1 deletion tests/conformance/testdata/copyrename/Dockerfile
@@ -1,3 +1,3 @@
FROM docker.io/library/centos:centos7
FROM quay.io/centos/centos:centos7
COPY file1 /usr/bin/file2
RUN ls -al /usr/bin/file2 && ! ls -al /usr/bin/file1
2 changes: 1 addition & 1 deletion tests/conformance/testdata/copysymlink/Dockerfile
@@ -1,2 +1,2 @@
FROM docker.io/library/centos:centos7
FROM quay.io/centos/centos:centos7
COPY file-link.tar.gz /
4 changes: 2 additions & 2 deletions tests/conformance/testdata/copysymlink/Dockerfile2
@@ -1,7 +1,7 @@
FROM docker.io/library/centos:centos7
FROM quay.io/centos/centos:centos7
COPY file.tar.gz /
RUN ln -s file.tar.gz file-link.tar.gz
RUN ls -l /file-link.tar.gz
FROM docker.io/library/centos:centos7
FROM quay.io/centos/centos:centos7
COPY --from=0 /file-link.tar.gz /
RUN ls -l /file-link.tar.gz
2 changes: 1 addition & 1 deletion tests/test_buildah_rpm.sh
Expand Up @@ -12,7 +12,7 @@ load helpers
skip_if_no_runtime

# Build a container to use for building the binaries.
image=docker.io/library/centos:centos7
image=quay.io/centos/centos:centos7
cid=$(buildah from --pull --signature-policy ${TEST_SOURCES}/policy.json $image)
root=$(buildah mount $cid)
commit=$(git log --format=%H -n 1)
Expand Down

0 comments on commit 9a9036c

Please sign in to comment.