Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace k8s.gcr.io/pause in tests with registry.k8s.io/pause #4210

Merged
merged 1 commit into from
Aug 31, 2022
Merged

Replace k8s.gcr.io/pause in tests with registry.k8s.io/pause #4210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/blobcache.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load helpers
blobcachedir=${TEST_SCRATCH_DIR}/cache
mkdir -p ${blobcachedir}
# Pull an image using a fresh directory for the blob cache.
run_buildah pull --blob-cache=${blobcachedir} $WITH_POLICY_JSON k8s.gcr.io/pause
run_buildah pull --blob-cache=${blobcachedir} $WITH_POLICY_JSON registry.k8s.io/pause
# Check that we dropped some files in there.
run find ${blobcachedir} -type f
echo "$output"
Expand All @@ -18,7 +18,7 @@ load helpers
blobcachedir=${TEST_SCRATCH_DIR}/cache
mkdir -p ${blobcachedir}
# Pull an image using a fresh directory for the blob cache.
run_buildah from --blob-cache=${blobcachedir} $WITH_POLICY_JSON k8s.gcr.io/pause
run_buildah from --blob-cache=${blobcachedir} $WITH_POLICY_JSON registry.k8s.io/pause
# Check that we dropped some files in there.
run find ${blobcachedir} -type f
echo "$output"
Expand Down Expand Up @@ -59,7 +59,7 @@ function _check_matches() {
blobcachedir=${TEST_SCRATCH_DIR}/cache
mkdir -p ${blobcachedir}
# Pull an image using a fresh directory for the blob cache.
run_buildah from --quiet --blob-cache=${blobcachedir} $WITH_POLICY_JSON k8s.gcr.io/pause
run_buildah from --quiet --blob-cache=${blobcachedir} $WITH_POLICY_JSON registry.k8s.io/pause
ctr="$output"
run_buildah add ${ctr} $BUDFILES/add-file/file /
# Commit the image without using the blob cache, using compression so that uncompressed blobs
Expand Down Expand Up @@ -88,7 +88,7 @@ function _check_matches() {
blobcachedir=${TEST_SCRATCH_DIR}/cache
mkdir -p ${blobcachedir}
# Pull an image using a fresh directory for the blob cache.
run_buildah from --quiet --blob-cache=${blobcachedir} $WITH_POLICY_JSON k8s.gcr.io/pause
run_buildah from --quiet --blob-cache=${blobcachedir} $WITH_POLICY_JSON registry.k8s.io/pause
ctr="$output"
run_buildah add ${ctr} $BUDFILES/add-file/file /
# Commit the image using the blob cache.
Expand Down
2 changes: 1 addition & 1 deletion tests/byid.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ load helpers
}

@test "push-by-id" {
for image in busybox k8s.gcr.io/pause ; do
for image in busybox registry.k8s.io/pause ; do
echo pulling/pushing image $image
_prefetch $image

Expand Down
8 changes: 4 additions & 4 deletions tests/images.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ load helpers
}

@test "images filter test" {
_prefetch k8s.gcr.io/pause busybox
run_buildah from --quiet --pull=false $WITH_POLICY_JSON k8s.gcr.io/pause
_prefetch registry.k8s.io/pause busybox
run_buildah from --quiet --pull=false $WITH_POLICY_JSON registry.k8s.io/pause
cid1=$output
run_buildah from --quiet --pull=false $WITH_POLICY_JSON busybox
cid2=$output

run_buildah 125 images --noheading --filter since k8s.gcr.io/pause
run_buildah 125 images --noheading --filter since registry.k8s.io/pause
expect_output 'invalid image filter "since": must be in the format "filter=value or filter!=value"'


run_buildah images --noheading --filter since=k8s.gcr.io/pause
run_buildah images --noheading --filter since=registry.k8s.io/pause
expect_line_count 1

# pause* and u* should only give us pause image not busybox since its a AND between
Expand Down
6 changes: 3 additions & 3 deletions tests/lists.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

load helpers

IMAGE_LIST=docker://k8s.gcr.io/pause:3.1
IMAGE_LIST_DIGEST=docker://k8s.gcr.io/pause@sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea
IMAGE_LIST_INSTANCE=docker://k8s.gcr.io/pause@sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39
IMAGE_LIST=docker://registry.k8s.io/pause:3.1
IMAGE_LIST_DIGEST=docker://registry.k8s.io/pause@sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea
IMAGE_LIST_INSTANCE=docker://registry.k8s.io/pause@sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39
IMAGE_LIST_AMD64_INSTANCE_DIGEST=sha256:59eec8837a4d942cc19a52b8c09ea75121acc38114a2c68b98983ce9356b8610
IMAGE_LIST_ARM_INSTANCE_DIGEST=sha256:c84b0a3a07b628bc4d62e5047d0f8dff80f7c00979e1e28a821a033ecda8fe53
IMAGE_LIST_ARM64_INSTANCE_DIGEST=sha256:f365626a556e58189fc21d099fc64603db0f440bff07f77c740989515c544a39
Expand Down