Rename Ruby Helm Charts tor RedHat

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

Author: phracek

test/test_helm_rails_ex_application.py

@@ -31,7 +31,7 @@
 class TestHelmRailsExTemplate:
 
     def setup_method(self):
-        package_name = "ruby-rails-application"
+        package_name = "redhat-ruby-rails-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(
@@ -48,41 +48,45 @@ def test_curl_connection(self):
         rails_ex_branch = "master"
         if VERSION == "3.3":
             rails_ex_branch = VERSION
-        self.hc_api.package_name = "ruby-imagestreams"
+        self.hc_api.package_name = "redhat-ruby-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "ruby-rails-application"
+        self.hc_api.package_name = "redhat-ruby-rails-application"
         assert self.hc_api.helm_package()
+        pod_name = f"rails_{VERSION.replace(".", "")}"
         assert self.hc_api.helm_installation(
             values={
                 "ruby_version": f"{VERSION}{TAG}",
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": rails_ex_branch,
                 "source_repository_url": "https://github.com/sclorg/rails-ex.git",
+                "name": pod_name,
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="rails-example")
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix=pod_name)
         assert self.hc_api.test_helm_curl_output(
-            route_name="rails-example",
+            route_name=pod_name,
             expected_str="Welcome to your Rails application"
         )
 
     def test_by_helm_test(self):
         rails_ex_branch = "master"
         if VERSION == "3.3":
             rails_ex_branch = VERSION
-        self.hc_api.package_name = "ruby-imagestreams"
+        self.hc_api.package_name = "redhat-ruby-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "ruby-rails-application"
+        self.hc_api.package_name = "redhat-ruby-rails-application"
         assert self.hc_api.helm_package()
+        pod_name = f"rails_{VERSION.replace(".", "")}"
         assert self.hc_api.helm_installation(
             values={
                 "ruby_version": f"{VERSION}{TAG}",
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": rails_ex_branch,
                 "source_repository_url": "https://github.com/sclorg/rails-ex.git",
+                "name": pod_name
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="rails-example")
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix=pod_name)
         assert self.hc_api.test_helm_chart(expected_str=["Welcome to your Rails application"])

test/test_helm_ruby_ex_application.py

@@ -31,7 +31,7 @@
 class TestHelmRubyExTemplate:
 
     def setup_method(self):
-        package_name = "ruby-rails-application"
+        package_name = "redhat-ruby-rails-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(
@@ -48,41 +48,45 @@ def test_curl_connection(self):
         rails_ex_branch = "master"
         if VERSION == "3.3":
             rails_ex_branch = VERSION
-        self.hc_api.package_name = "ruby-imagestreams"
+        self.hc_api.package_name = "redhat-ruby-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "ruby-rails-application"
+        self.hc_api.package_name = "redhat-ruby-rails-application"
         assert self.hc_api.helm_package()
+        pod_name = f"rails_{VERSION.replace(".", "")}"
         assert self.hc_api.helm_installation(
             values={
                 "ruby_version": f"{VERSION}{TAG}",
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": rails_ex_branch,
                 "source_repository_url": "https://github.com/sclorg/ruby-ex.git",
+                "name": pod_name,
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="ruby-example")
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix=pod_name, timeout=300)
         assert self.hc_api.test_helm_curl_output(
-            route_name="ruby-example",
+            route_name=pod_name,
             expected_str="Welcome to your Ruby application"
         )
 
     def test_by_helm_test(self):
         rails_ex_branch = "master"
         if VERSION == "3.3":
             rails_ex_branch = VERSION
-        self.hc_api.package_name = "ruby-imagestreams"
+        self.hc_api.package_name = "redhat-ruby-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "ruby-rails-application"
+        self.hc_api.package_name = "redhat-ruby-rails-application"
         assert self.hc_api.helm_package()
+        pod_name = f"rails_{VERSION.replace(".", "")}"
         assert self.hc_api.helm_installation(
             values={
                 "ruby_version": f"{VERSION}{TAG}",
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": rails_ex_branch,
                 "source_repository_url": "https://github.com/sclorg/ruby-ex.git",
+                "name": pod_name,
             }
         )
-        assert self.hc_api.is_s2i_pod_running(pod_name_prefix="ruby-example")
+        assert self.hc_api.is_s2i_pod_running(pod_name_prefix=pod_name, timeout=300)
         assert self.hc_api.test_helm_chart(expected_str=["Welcome to your Ruby application"])

test/test_helm_ruby_imagestreams.py

@@ -23,7 +23,7 @@
 
 @pytest.fixture(scope="module")
 def helm_api(request):
-    helm_api = HelmChartsAPI(path=test_dir / "../charts/redhat", package_name="ruby-imagestreams", tarball_dir=test_dir)
+    helm_api = HelmChartsAPI(path=test_dir / "../charts/redhat", package_name="redhat-ruby-imagestreams", tarball_dir=test_dir)
     # app_name = os.path.basename(request.param)
     yield helm_api
     pass