Do not test VERSIONS 3.9-minimal and 3.11-minimal in OpenShift 4.

They are not present in RedHat Container Catalog.

Skip test_python_imagestream for VERSION 3.12 and RHEL8
We do not provide this combination.

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

test/run-openshift-remote-cluster

@@ -41,9 +41,12 @@ export CT_OCP4_TEST=true
 test -n "${IMAGE_NAME-}" || false 'make sure $IMAGE_NAME is defined'
 test -n "${VERSION-}" || false 'make sure $VERSION is defined'
 
-
-TEST_SUMMARY=''
-TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "openshift-remote-cluster"
+if [[ "${VERSION}" == "3.9-minimal" ]] || [[ "${VERSION}" == "3.11-minimal" ]]; then
+  echo "Skipping tests for minimal images. We do not provide them in container catalog registry."
+  exit 0
+else
+  TEST_SUMMARY=''
+  TEST_SET=${TESTS:-$TEST_LIST} ct_run_tests_from_testset "openshift-remote-cluster"
+fi
 
 # vim: set tabstop=2:shiftwidth=2:expandtab:
-

test/test-lib-python.sh

@@ -37,6 +37,10 @@ function ct_pull_or_import_postgresql() {
 
 # Check the imagestream
 function test_python_imagestream() {
+  if [[ "${VERSIONS}" == "3.12" ]] && [[ "${OS}" == "rhel8" ]]; then
+    echo "Skipping tests for ${VERSIONS}. It is not supported in Container Catalog. Imagestreams do not exist for them."
+    return 0
+  fi
   if [[ "${VERSIONS}" == "3.9-minimal" ]] || [[ "${VERSIONS}" == "3.11-minimal" ]]; then
     echo "Skipping tests for ${VERSIONS}. It is not supported in Container Catalog. Imagestreams do not exist for them."
     return 0
@@ -83,7 +87,7 @@ function test_python_s2i_app_ex() {
   if [[ "${VERSION}" == *"minimal"* ]]; then
     VERSION=$(echo "${VERSION}" | cut -d "-" -f 1)
   fi
-  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]]; then
+  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]] || [[ "${VERSION}" == "3.12-minimal" ]]; then
     branch="4.2.x"
   else
     branch="2.2.x"
@@ -106,7 +110,7 @@ django-postgresql-persistent.json"
   if [[ "${VERSION}" == *"minimal"* ]]; then
     VERSION=$(echo "${VERSION}" | cut -d "-" -f 1)
   fi
-  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]]; then
+  if [[ "${VERSION}" == "3.11" ]] || [[ "${VERSION}" == "3.12" ]] || [[ "${VERSION}" == "3.12-minimal" ]]; then
     postgresql_image="quay.io/sclorg/postgresql-12-c8s|postgresql:12"
     postgresql_version="12"
     branch="4.2.x"