Fix helm charts.

We use prefix `redhat-` in helm charts Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Feb 14, 2025 · b50dc24 · b50dc24
1 parent 934f046
commit b50dc24
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/test/test_redis_shared_helm_imagestreams.py b/test/test_redis_shared_helm_imagestreams.py
@@ -11,7 +11,7 @@
 class TestHelmRHELRedisImageStreams:
 
     def setup_method(self):
-        package_name = "redis-imagestreams"
+        package_name = "redhat-redis-imagestreams"
         path = test_dir
         self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir)
         self.hc_api.clone_helm_chart_repo(
@@ -23,13 +23,15 @@ def teardown_method(self):
         self.hc_api.delete_project()
 
     @pytest.mark.parametrize(
-        "version,registry",
+        "version,registry,expected",
         [
-            ("6-el8", "registry.redhat.io/rhel8/redis-6:latest"),
-            ("6-el9", "registry.redhat.io/rhel9/redis-6:latest"),
+            ("6-el8", "registry.redhat.io/rhel8/redis-6:latest", True),
+            ("6-el9", "registry.redhat.io/rhel9/redis-6:latest", True),
+            ("7-el9", "registry.redhat.io/rhel9/redis-7:latest", True),
+            ("7-el8", "registry.redhat.io/rhel8/redis-7:latest", False),
         ],
     )
-    def test_package_imagestream(self, version, registry):
+    def test_package_imagestream(self, version, registry, expected):
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        assert self.hc_api.check_imagestreams(version=version, registry=registry)
+        assert self.hc_api.check_imagestreams(version=version, registry=registry) == expected
diff --git a/test/test_redis_shared_helm_template.py b/test/test_redis_shared_helm_template.py
@@ -23,9 +23,9 @@
 class TestHelmRedisPersistent:
 
     def setup_method(self):
-        package_name = "redis-persistent"
+        package_name = "redhat-redis-persistent"
         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"
@@ -35,10 +35,10 @@ def teardown_method(self):
         self.hc_api.delete_project()
 
     def test_package_persistent_by_helm_chart_test(self):
-        self.hc_api.package_name = "redis-imagestreams"
+        self.hc_api.package_name = "redhat-redis-imagestreams"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "redis-persistent"
+        self.hc_api.package_name = "redhat-redis-persistent"
         self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={