Enable tests on OpenShift shared cluster.

Do not tests MySQL-84 in OpenShift tests yet;)

It is not shipped

Also test only examples on local cluster and not on shared_cluster

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

Author: phracek

test/test_mysql_imagestream.py

@@ -37,8 +37,10 @@ def teardown_method(self):
         ]
     )
     def test_imagestream_template(self, template):
+        if VERSION == "8.4":
+            # It is not shipped yet
+            pytest.skip("Skipping test for 8.4")
         os_name = ''.join(i for i in OS if not i.isdigit())
-        print(os.getcwd())
         assert self.oc_api.deploy_image_stream_template(
             imagestream_file=f"imagestreams/mysql-{os_name}.json",
             template_file=f"examples/{template}",

test/test_mysql_imagestream_template.py

@@ -37,6 +37,9 @@ def teardown_method(self):
         ]
     )
     def test_imagestream_template(self, template):
+        if VERSION == "8.4":
+            # It is not shipped yet
+            pytest.skip("Skipping test for 8.4")
         os_name = ''.join(i for i in OS if not i.isdigit())
         assert self.oc_api.deploy_image_stream_template(
             imagestream_file=f"imagestreams/mysql-{os_name}.json",

test/test_mysql_shared_helm_template.py

@@ -7,6 +7,15 @@
 
 test_dir = Path(os.path.abspath(os.path.dirname(__file__)))
 
+VERSION = os.getenv("VERSION")
+IMAGE_NAME = os.getenv("IMAGE_NAME")
+OS = os.getenv("TARGET")
+
+TAGS = {
+    "rhel8": "-el8",
+    "rhel9": "-el9"
+}
+TAG = TAGS.get(OS, None)
 
 class TestHelmMySQLDBPersistent:
 
@@ -22,19 +31,21 @@ def setup_method(self):
     def teardown_method(self):
         self.hc_api.delete_project()
 
-    @pytest.mark.parametrize(
-        "version",
-        [
-            "8.0-el8",
-            "8.0-el9",
-        ],
-    )
-    def test_package_persistent(self, version):
+    def test_package_persistent(self):
+        if VERSION == "8.4":
+            # It is not shipped yet
+            pytest.skip("Skipping test for 8.4")
         self.hc_api.package_name = "redhat-mysql-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
         self.hc_api.package_name = "redhat-mysql-persistent"
         assert self.hc_api.helm_package()
-        assert self.hc_api.helm_installation(values={"mysql_version": version, "namespace": self.hc_api.namespace})
+        assert self.hc_api.helm_installation(
+            values={
+                "mysql_version": f"{VERSION}{TAG}",
+                "namespace": self.hc_api.namespace,
+                "database_service_name": "mysql"
+            }
+        )
         assert self.hc_api.is_pod_running(pod_name_prefix="mysql")
         assert self.hc_api.test_helm_chart(expected_str=["42", "testval"])