From 371cad3cd50582e5c722531d93b222e0133bb328 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 11 Feb 2025 09:22:10 +0100 Subject: [PATCH 1/4] Fix postgresql-container test for Helm Charts. The helm charts have been renamed from `postgresql-*` -> `redhat-postgresql-*` Signed-off-by: Petr "Stone" Hracek --- test/test_shared_helm_postgresql_imagestreams.py | 2 +- test/test_shared_helm_postgresql_template.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_shared_helm_postgresql_imagestreams.py b/test/test_shared_helm_postgresql_imagestreams.py index bf0ea4b4..94f988e4 100644 --- a/test/test_shared_helm_postgresql_imagestreams.py +++ b/test/test_shared_helm_postgresql_imagestreams.py @@ -18,7 +18,7 @@ class TestHelmRHELPostgresqlImageStreams: def setup_method(self): - package_name = "postgresql-imagestreams" + package_name = "redhat-postgresql-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( diff --git a/test/test_shared_helm_postgresql_template.py b/test/test_shared_helm_postgresql_template.py index 7c16e52b..226e4e04 100644 --- a/test/test_shared_helm_postgresql_template.py +++ b/test/test_shared_helm_postgresql_template.py @@ -29,7 +29,7 @@ class TestHelmPostgresqlPersistent: def setup_method(self): - package_name = "postgresql-persistent" + package_name = "redhat-postgresql-persistent" 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( @@ -41,10 +41,10 @@ def teardown_method(self): self.hc_api.delete_project() def test_package_persistent(self): - self.hc_api.package_name = "postgresql-imagestreams" + self.hc_api.package_name = "redhat-postgresql-imagestreams" assert self.hc_api.helm_package() assert self.hc_api.helm_installation() - self.hc_api.package_name = "postgresql-persistent" + self.hc_api.package_name = "redhat-postgresql-persistent" assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ From 120332b9a58cfd8649415bfc8aacf8123d1553e3 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 12 Feb 2025 11:43:41 +0100 Subject: [PATCH 2/4] Do not use shared_cluster on OpenShift 4 Signed-off-by: Petr "Stone" Hracek --- test/test_shared_helm_postgresql_imagestreams.py | 2 +- test/test_shared_helm_postgresql_template.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_shared_helm_postgresql_imagestreams.py b/test/test_shared_helm_postgresql_imagestreams.py index 94f988e4..70d22395 100644 --- a/test/test_shared_helm_postgresql_imagestreams.py +++ b/test/test_shared_helm_postgresql_imagestreams.py @@ -20,7 +20,7 @@ class TestHelmRHELPostgresqlImageStreams: def setup_method(self): package_name = "redhat-postgresql-imagestreams" path = test_dir - self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, remote=True) + self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir) self.hc_api.clone_helm_chart_repo( repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts", subdir="charts/redhat" diff --git a/test/test_shared_helm_postgresql_template.py b/test/test_shared_helm_postgresql_template.py index 226e4e04..37562798 100644 --- a/test/test_shared_helm_postgresql_template.py +++ b/test/test_shared_helm_postgresql_template.py @@ -31,7 +31,7 @@ class TestHelmPostgresqlPersistent: def setup_method(self): package_name = "redhat-postgresql-persistent" path = test_dir - self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir, remote=True) + self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir) self.hc_api.clone_helm_chart_repo( repo_url="https://github.com/sclorg/helm-charts", repo_name="helm-charts", subdir="charts/redhat" From 53203ac29bdb11f948e20f5b254ff51017c0ae33 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 12 Feb 2025 13:14:01 +0100 Subject: [PATCH 3/4] Fix helm chart name Signed-off-by: Petr "Stone" Hracek --- test/test_shared_helm_postgresql_template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_shared_helm_postgresql_template.py b/test/test_shared_helm_postgresql_template.py index 37562798..89d2cb7f 100644 --- a/test/test_shared_helm_postgresql_template.py +++ b/test/test_shared_helm_postgresql_template.py @@ -49,8 +49,8 @@ def test_package_persistent(self): assert self.hc_api.helm_installation( values={ ".image.tag": f"{VERSION}{TAG}", - ".namespace": self.hc_api.namespace + ".namespace": self.hc_api.namespace, } ) - assert self.hc_api.is_pod_running(pod_name_prefix="postgresql-persistent") + assert self.hc_api.is_pod_running(pod_name_prefix="redhat-postgresql-persistent") assert self.hc_api.test_helm_chart(expected_str=["accepting connection"]) From 4f87923e68fedfdc1cfd13f243cbfd56be554127 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 14 Feb 2025 11:31:47 +0100 Subject: [PATCH 4/4] Fix helm_charts_imagestreams Signed-off-by: Petr "Stone" Hracek --- test/test_shared_helm_postgresql_imagestreams.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_shared_helm_postgresql_imagestreams.py b/test/test_shared_helm_postgresql_imagestreams.py index 70d22395..c435c6f9 100644 --- a/test/test_shared_helm_postgresql_imagestreams.py +++ b/test/test_shared_helm_postgresql_imagestreams.py @@ -20,7 +20,7 @@ class TestHelmRHELPostgresqlImageStreams: def setup_method(self): package_name = "redhat-postgresql-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"