Skip to content

Commit

Permalink
Do not use latest tag for quay.io/centos7/* images
Browse files Browse the repository at this point in the history
Instead of use :centos7 tag

Signed-off-by: Petr "Stone" Hracek <[email protected]>
  • Loading branch information
phracek committed Mar 28, 2024
1 parent cb248e0 commit ad945b8
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ ct_get_public_image_name() {
elif [ "$os" == "rhel9" ]; then
public_image_name=$registry/rhel9/$base_image_name-${version//./}
elif [ "$os" == "centos7" ]; then
public_image_name=$registry/centos7/$base_image_name-${version//./}-centos7
public_image_name=$registry/centos7/$base_image_name-${version//./}-centos7:centos7
elif [ "$os" == "c8s" ]; then
public_image_name=$registry/sclorg/$base_image_name-${version//./}-c8s
elif [ "$os" == "c9s" ]; then
Expand Down
2 changes: 1 addition & 1 deletion tests/failures/check/v0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM quay.io/centos7/s2i-core-centos7
FROM quay.io/centos7/s2i-core-centos7:centos7
LABEL name=test-image
8 changes: 4 additions & 4 deletions tests/test-lib/image_availability
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ set -e
. test-lib.sh

# This should succeed
if ! ct_pull_image quay.io/centos7/ruby-27-centos7; then
if ! ct_pull_image quay.io/centos7/ruby-27-centos7:centos7; then
echo "image_availability test failed"
false
fi

# This should fail
if ct_pull_image quay.io/centos7/ruby-24-centos7 false 1; then
if ct_pull_image quay.io/centos7/ruby-24-centos7:centos7 false 1; then
echo "image_availability test failed"
false
fi

# This should succeed
if ! ct_check_image_availability quay.io/centos7/ruby-27-centos7; then
if ! ct_check_image_availability quay.io/centos7/ruby-27-centos7:centos7; then
echo "check_image_availability test failed"
false
fi

# This should fail
if ct_check_image_availability quay.io/centos7/ruby-24-centos7; then
if ct_check_image_availability quay.io/centos7/ruby-24-centos7:centos7; then
echo "check_image_availability test failed"
false
fi
Expand Down
2 changes: 1 addition & 1 deletion tests/test-lib/public_image_name
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
. test-lib.sh

combinations="rhel7:registry.redhat.io/rhscl/postgresql-10-rhel7
centos7:quay.io/centos7/postgresql-10-centos7
centos7:quay.io/centos7/postgresql-10-centos7:centos7
rhel8:registry.redhat.io/rhel8/postgresql-10
"

Expand Down

0 comments on commit ad945b8

Please sign in to comment.