From ad945b853928acaaac8a4ad735ed6e79a4eb6821 Mon Sep 17 00:00:00 2001
From: "Petr \"Stone\" Hracek" <phracek@redhat.com>
Date: Thu, 28 Mar 2024 15:03:23 +0100
Subject: [PATCH] Do not use latest tag for quay.io/centos7/* images

Instead of use :centos7 tag

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
---
 test-lib.sh                        | 2 +-
 tests/failures/check/v0/Dockerfile | 2 +-
 tests/test-lib/image_availability  | 8 ++++----
 tests/test-lib/public_image_name   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test-lib.sh b/test-lib.sh
index a57e9119..130dba2b 100644
--- a/test-lib.sh
+++ b/test-lib.sh
@@ -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
diff --git a/tests/failures/check/v0/Dockerfile b/tests/failures/check/v0/Dockerfile
index 6fc6c9f2..1fb2bd26 100644
--- a/tests/failures/check/v0/Dockerfile
+++ b/tests/failures/check/v0/Dockerfile
@@ -1,2 +1,2 @@
-FROM quay.io/centos7/s2i-core-centos7
+FROM quay.io/centos7/s2i-core-centos7:centos7
 LABEL name=test-image
diff --git a/tests/test-lib/image_availability b/tests/test-lib/image_availability
index 0ed9b27f..d1c0ecd1 100755
--- a/tests/test-lib/image_availability
+++ b/tests/test-lib/image_availability
@@ -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
diff --git a/tests/test-lib/public_image_name b/tests/test-lib/public_image_name
index 92fcb2b2..c9001ac1 100755
--- a/tests/test-lib/public_image_name
+++ b/tests/test-lib/public_image_name
@@ -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
 "