Fix OpenShift tests and enable testing on shared_cluster

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

Author: phracek

test/test_imagestreams_quickstart.py

@@ -31,7 +31,7 @@
 class TestImagestreamsQuickstart:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="nodejs-example", version=VERSION)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="nodejs-example", version=VERSION, shared_cluster=True)
         assert self.oc_api.upload_image(DEPLOYED_PGSQL_IMAGE, PGSQL_IMAGE_TAG)
 
     def teardown_method(self):
@@ -49,21 +49,23 @@ def test_nodejs_template_inside_cluster(self, template):
         if "minimal" in VERSION:
             new_version = VERSION.replace("-minimal", "")
         service_name = "nodejs-example"
+        if os == "rhel10":
+            pytest.skip("Do NOT test on RHEL10 yet.")
         template_url = self.oc_api.get_raw_url_for_json(
             container="nodejs-ex", dir="openshift/templates", filename=template, branch="master"
         )
         openshift_args = [
             f"SOURCE_REPOSITORY_URL=https://github.com/sclorg/nodejs-ex.git",
             f"SOURCE_REPOSITORY_REF=master",
-            f"NODEJS_VERSION={new_version}",
+            f"NODEJS_VERSION={VERSION}",
             f"NAME={service_name}"
         ]
         if template != "nodejs.json":
             openshift_args = [
                 f"SOURCE_REPOSITORY_URL=https://github.com/sclorg/nodejs-ex.git",
                 f"SOURCE_REPOSITORY_REF=master",
                 f"POSTGRESQL_VERSION={IMAGE_TAG}",
-                f"NODEJS_VERSION={new_version}",
+                f"NODEJS_VERSION={VERSION}",
                 f"NAME={service_name}",
                 f"DATABASE_USER=testu",
                 f"DATABASE_PASSWORD=testpwd",
@@ -76,7 +78,7 @@ def test_nodejs_template_inside_cluster(self, template):
             name_in_template="nodejs",
             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="Node.js Crud Application"
         )

test/test_nodejs_ex_standalone.py

@@ -31,7 +31,7 @@ def test_nodejs_ex_template_inside_cluster(self):
             context=".",
             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="Node.js Crud Application"
         )

test/test_nodejs_ex_templates.py

@@ -43,6 +43,8 @@ def teardown_method(self):
     )
     def test_nodejs_ex_template_inside_cluster(self, template):
         service_name = "nodejs-testing"
+        if os == "rhel10":
+            pytest.skip("Do NOT test on RHEL10 yet.")
         template_url = self.oc_api.get_raw_url_for_json(
             container="nodejs-ex", dir="openshift/templates", filename=template, branch="master"
         )
@@ -73,7 +75,7 @@ def test_nodejs_ex_template_inside_cluster(self, template):
             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="Node.js Crud Application"
         )

test/test_nodejs_s2i_standalone.py

@@ -31,7 +31,7 @@ def test_nodejs_ex_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="This is a node.js echo service"
         )

test/test_shared_helm_nodejs_application.py

@@ -38,31 +38,11 @@ def setup_method(self):
     def teardown_method(self):
         self.hc_api.delete_project()
 
-    def test_curl_connection(self):
-        if self.hc_api.oc_api.shared_cluster:
-            pytest.skip("Do NOT test on shared cluster")
-        self.hc_api.package_name = "nodejs-imagestreams"
-        self.hc_api.helm_package()
-        assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "nodejs-application"
-        assert self.hc_api.helm_package()
-        assert self.hc_api.helm_installation(
-            values={
-                "nodejs_version": f"{VERSION}{TAG}",
-                "namespace": self.hc_api.namespace
-            }
-        )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="nodejs-example")
-        assert self.hc_api.test_helm_curl_output(
-            route_name="nodejs-example",
-            expected_str="Node.js Crud Application"
-        )
-
     def test_by_helm_test(self):
-        self.hc_api.package_name = "nodejs-imagestreams"
+        self.hc_api.package_name = "redhat-nodejs-imagestreams"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "nodejs-application"
+        self.hc_api.package_name = "redhat-nodejs-application"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={