Do not tests imagestreams on RHEL10 yet.

They do not exist.

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

Author: phracek

test/test-lib-php.sh

@@ -20,7 +20,10 @@ function test_php_integration() {
 
 # Check the imagestream
 function test_php_imagestream() {
-
+  if [ "$OS" == "rhel10" ]; then
+    echo "Imagestreams are not released yet for RHEL10. Let's skip this test."
+    return
+  fi
   ct_os_test_image_stream_s2i "${THISDIR}/imagestreams/php-${OS%[0-9]*}.json" "${IMAGE_NAME}" \
                               "https://github.com/sclorg/s2i-php-container.git" \
                               test/test-app \
@@ -31,6 +34,10 @@ function test_php_imagestream() {
 function test_php_template() {
   local supported_use_case
   local check_msg
+  if [ "$OS" == "rhel10" ]; then
+    echo "Imagestreams are not released yet for RHEL10. Let's skip this test."
+    return
+  fi
   if [ "${VERSION}" == "7.4" ] || [ "${VERSION}" == "8.0" ]; then
     supported_use_case="True"
     BRANCH_TO_TEST="4.X"

test/test_php_deploy_templates.py

@@ -38,7 +38,7 @@
 class TestDeployTemplate:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION, shared_cluster=True)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION)
         self.oc_api.import_is("imagestreams/php-rhel.json", "", skip_check=True)
         #assert self.oc_api.upload_image(DEPLOYED_MYSQL_IMAGE, IMAGE_SHORT)
 
@@ -52,7 +52,8 @@ def teardown_method(self):
         ]
     )
     def test_php_template_inside_cluster(self, template):
-
+        if OS == "rhel10":
+            pytest.skip("Do NOT test on RHEL10 yet.")
         service_name = "php-testing"
         template_url = self.oc_api.get_raw_url_for_json(
             container="cakephp-ex", dir="openshift/templates", filename=template, branch=branch_to_test
@@ -74,7 +75,7 @@ def test_php_template_inside_cluster(self, template):
             name_in_template="php",
             openshift_args=openshift_args
         )
-        assert self.oc_api.template_deployed(name_in_template=service_name)
+        assert self.oc_api.is_template_deployed(name_in_template=service_name)
         assert self.oc_api.check_response_inside_cluster(
             name_in_template=service_name, expected_output=check_msg
         )

test/test_php_s2i_imagestreams.py

@@ -1,5 +1,6 @@
 import os
 import sys
+import pytest
 
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
@@ -26,14 +27,17 @@ def teardown_method(self):
         self.oc_api.delete_project()
 
     def test_php_template_inside_cluster(self):
+        if OS == "rhel10":
+            pytest.skip("Do NOT test on RHEL10 yet.")
         service_name = f"php-{SHORT_VERSION}-testing"
         assert self.oc_api.deploy_imagestream_s2i(
             imagestream_file="imagestreams/php-rhel.json",
             image_name=IMAGE_NAME,
             app="https://github.com/sclorg/s2i-php-container.git",
-            context="test/test-app"
+            context="test/test-app",
+            service_name=service_name
         )
-        assert self.oc_api.template_deployed(name_in_template=service_name)
+        assert self.oc_api.is_template_deployed(name_in_template=service_name)
         assert self.oc_api.check_response_inside_cluster(
             name_in_template=service_name, expected_output="Test PHP passed"
         )

test/test_php_s2i_integration.py

@@ -30,7 +30,7 @@ def test_php_template_inside_cluster(self):
             context="test/test-app",
             service_name=service_name
         )
-        assert self.oc_api.template_deployed(name_in_template=service_name)
+        assert self.oc_api.is_template_deployed(name_in_template=service_name)
         assert self.oc_api.check_response_inside_cluster(
             name_in_template=service_name, expected_output="Test PHP passed"
         )