Fix ruby-rails application. On shared_cluster it took too

much time.

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

Author: phracek

test/test-lib-ruby.sh

@@ -55,7 +55,10 @@ function test_ruby_integration() {
 
 # Check the imagestream
 function test_ruby_imagestream() {
-
+  if [[ "${OS}" == "rhel10" ]]; then
+    echo "Testing templates is suppressed on RHEL10. Imagestreams do not exist yet."
+    return
+  fi
   ct_os_test_image_stream_s2i "${THISDIR}/imagestreams/ruby-${OS%[0-9]*}.json" "${IMAGE_NAME}" \
                               "https://github.com/sclorg/s2i-ruby-container.git" \
                               "${VERSION}/test/puma-test-app" \
@@ -82,7 +85,6 @@ function test_ruby_s2i_rails_templates() {
 }
 
 function test_ruby_s2i_rails_persistent_templates() {
-
   ct_os_test_template_app "${IMAGE_NAME}" \
                         "https://raw.githubusercontent.com/sclorg/rails-ex/master/openshift/templates/rails-postgresql-persistent.json" \
                         "ruby" \
@@ -109,6 +111,10 @@ function test_ruby_s2i_local_persistent_templates() {
 }
 
 function test_ruby_s2i_local_app_templates() {
+  if [[ "${OS}" == "rhel10" ]]; then
+    echo "Testing templates is suppressed on RHEL10. Imagestreams do not exist yet."
+    return
+  fi
   # TODO: this was not working because the referenced example dir was added as part of this commit
   ct_os_test_template_app "${IMAGE_NAME}" \
                         "${THISDIR}/examples/rails.json" \

test/test_helm_ruby_rails_application.py

@@ -23,7 +23,8 @@
 
 TAGS = {
     "rhel8": "-ubi8",
-    "rhel9": "-ubi9"
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10"
 }
 TAG = TAGS.get(OS, None)
 
@@ -61,12 +62,14 @@ def test_curl_connection(self):
             }
         )
         assert self.hc_api.is_s2i_pod_running(pod_name_prefix="rails-example")
-        assert self.hc_api.test_helm_curl_output(
-            route_name="rails-example",
-            expected_str="Welcome to your Rails application"
+        assert self.hc_api.oc_api.check_response_inside_cluster(
+            name_in_template="rails-example",
+            expected_output="Welcome to your Rails application"
         )
 
     def test_by_helm_test(self):
+        if OS == "rhel10":
+            pytest.skip("Do NOT test on RHEL10.")
         rails_ex_branch = "master"
         if VERSION == "3.3":
             rails_ex_branch = VERSION
@@ -82,5 +85,5 @@ def test_by_helm_test(self):
                 "source_repository_ref": rails_ex_branch,
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="rails-example")
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="rails-example", timeout=480)
         assert self.hc_api.test_helm_chart(expected_str=["Welcome to your Rails application"])

test/test_s2i_imagestreams.py

@@ -1,6 +1,8 @@
 import os
 import sys
 
+import pytest
+
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
 
@@ -12,12 +14,12 @@
 
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
-OS = os.getenv("OS")
+OS = os.getenv("TARGET")
 
 SHORT_VERSION = "".join(VERSION.split("."))
 
 
-class TestRubyImagestreams:
+class TestRubyS2IImagestreams:
 
     def setup_method(self):
         self.oc_api = OpenShiftAPI(pod_name_prefix="ruby", version=VERSION, shared_cluster=True)
@@ -26,6 +28,8 @@ def teardown_method(self):
         self.oc_api.delete_project()
 
     def ruby(self):
+        if OS == "rhel10":
+            pytest.skip("Do NOT test on RHEL10.")
         service_name = f"ruby-{SHORT_VERSION}-testing"
         assert self.oc_api.deploy_imagestream_s2i(
             imagestream_file=f"{VERSION}/imagestreams/ruby-rhel.json",

test/test_s2i_local_templates.py

@@ -19,7 +19,8 @@
 
 TAGS = {
     "rhel8": "-el8",
-    "rhel9": "-el9"
+    "rhel9": "-el9",
+    "rhel10": "-el10",
 }
 TAG = TAGS.get(OS, None)
 IMAGE_SHORT = f"postgresql:12{TAG}"
@@ -43,6 +44,8 @@ def teardown_method(self):
         ]
     )
     def test_rails_template_inside_cluster(self, template):
+        if OS == "rhel10":
+            pytest.skip("Do NOT test on RHEL10.")
         service_name = "ruby-testing"
         rails_ex_branch = "master"
         if VERSION == "3.3":

test/test_s2i_rails_ex_templates.py

@@ -19,7 +19,8 @@
 
 TAGS = {
     "rhel8": "-el8",
-    "rhel9": "-el9"
+    "rhel9": "-el9",
+    "rhel10": "-el10"
 }
 TAG = TAGS.get(OS, None)
 IMAGE_SHORT = f"postgresql:12{TAG}"
@@ -29,8 +30,7 @@
 class TestS2IRailsExTemplate:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="ruby-testing", version=VERSION)
-        assert self.oc_api.upload_image(DEPLOYED_PGSQL_IMAGE, IMAGE_SHORT)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="ruby-testing", version=VERSION, shared_cluster=True)
 
     def teardown_method(self):
         self.oc_api.delete_project()
@@ -43,6 +43,12 @@ def teardown_method(self):
         ]
     )
     def test_rails_template_inside_cluster(self, template):
+        if OS == "rhel10":
+            pytest.skip("Do NOT test on RHEL10.")
+        if self.oc_api.shared_cluster:
+            assert self.oc_api.upload_image_to_external_registry(DEPLOYED_PGSQL_IMAGE, IMAGE_SHORT)
+        else:
+            assert self.oc_api.upload_image(DEPLOYED_PGSQL_IMAGE, IMAGE_SHORT)
         service_name = "ruby-testing"
         rails_ex_branch = "master"
         if VERSION == "3.3":
@@ -54,7 +60,8 @@ def test_rails_template_inside_cluster(self, template):
             f"SOURCE_REPOSITORY_URL=https://github.com/sclorg/rails-ex.git",
             f"SOURCE_REPOSITORY_REF={rails_ex_branch}",
             f"RUBY_VERSION={VERSION}",
-            f"NAME={service_name}"
+            f"NAME={service_name}",
+            "MEMORY_LIMIT=1Gi",
         ]
         if template != "rails.json":
             openshift_args = [