Helm Charts have been rename to 'redhat-' prefix

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

Author: phracek

test/test_php_deploy_templates.py

@@ -16,10 +16,10 @@
 
 if VERSION == "7.4" or VERSION == "8.0":
     branch_to_test = "4.X"
-    check_msg = "Welcome to CakePHP 4.5"
+    check_msg = "Welcome to CakePHP"
 elif VERSION == "8.1" or VERSION == "8.2" or VERSION == "8.3":
     branch_to_test = "5.X"
-    check_msg = "Welcome to CakePHP 5"
+    check_msg = "Welcome to CakePHP"
 else:
     branch_to_test = "master"
     check_msg = "Welcome to your CakePHP application on OpenShift"

test/test_shared_helm_cakephp_application.py

@@ -20,9 +20,9 @@
 OS = os.getenv("TARGET")
 
 if VERSION == "7.4" or VERSION == "8.0":
-    check_msg = "Welcome to CakePHP 4.5"
+    check_msg = "Welcome to CakePHP"
 elif VERSION == "8.1" or VERSION == "8.2" or VERSION == "8.3":
-    check_msg = "Welcome to CakePHP 4.5"
+    check_msg = "Welcome to CakePHP"
 else:
     check_msg = "Welcome to your CakePHP application on OpenShift"
 
@@ -36,7 +36,7 @@
 class TestHelmCakePHPTemplate:
 
     def setup_method(self):
-        package_name = "php-cakephp-application"
+        package_name = "redhat-php-cakephp-application"
         path = test_dir
         self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, remote=True)
         self.hc_api.clone_helm_chart_repo(
@@ -50,34 +50,34 @@ def teardown_method(self):
     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 = "php-imagestreams"
+        self.hc_api.package_name = "redhat-php-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "php-cakephp-application"
+        self.hc_api.package_name = "redhat-php-cakephp-application"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
                 "php_version": f"{VERSION}{TAG}",
                 "namespace": self.hc_api.namespace
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="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
         )
 
     def test_by_helm_test(self):
-        self.hc_api.package_name = "php-imagestreams"
+        self.hc_api.package_name = "redhat-php-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "php-cakephp-application"
+        self.hc_api.package_name = "redhat-php-cakephp-application"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
                 "php_version": f"{VERSION}{TAG}",
                 "namespace": self.hc_api.namespace
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="cakephp-example")
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="cakephp-example", timeout=300)
         assert self.hc_api.test_helm_chart(expected_str=[check_msg])

test/test_shared_helm_chart_imagestreams.py

@@ -18,7 +18,7 @@
 class TestHelmRHELPHPImageStreams:
 
     def setup_method(self):
-        package_name = "php-imagestreams"
+        package_name = "redhat-php-imagestreams"
         path = test_dir
         self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, remote=True)
         self.hc_api.clone_helm_chart_repo(
@@ -36,7 +36,7 @@ def teardown_method(self):
             ("8.2-ubi8", "registry.redhat.io/ubi8/php-82:latest", True),
             ("8.1-ubi9", "registry.redhat.io/ubi9/php-81:latest", True),
             ("8.0-ubi9", "registry.redhat.io/ubi9/php-80:latest", True),
-            ("8.0-ubi8", "registry.redhat.io/ubi8/php-80:latest", True),
+            ("8.0-ubi8", "registry.redhat.io/ubi8/php-80:latest", False),
             ("7.4-ubi8", "registry.redhat.io/ubi8/php-74:latest", True),
         ],
     )