Fix nginx-container OpenShift 4 tests

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

Author: phracek

test/run-openshift-pytest

@@ -10,4 +10,4 @@ THISDIR=$(dirname ${BASH_SOURCE[0]})
 
 git show -s
 
-cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_nginx_*.py
+cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_*.py

test/test_nginx_imagestream_s2i.py

@@ -14,6 +14,11 @@
 OS = os.getenv("OS")
 VERSION = os.getenv("VERSION")
 
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9"
+}
+TAG = TAGS.get(OS, None)
 
 # bash test=test_nginx_imagestream
 class TestNginxImagestreamS2I:

test/test_shared_helm_nginx_imagestreams.py

@@ -18,7 +18,7 @@
 class TestHelmRHELNginxImageStreams:
 
     def setup_method(self):
-        package_name = "nginx-imagestreams"
+        package_name = "redhat-nginx-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(
@@ -30,17 +30,17 @@ def teardown_method(self):
         self.hc_api.delete_project()
 
     @pytest.mark.parametrize(
-        "version,registry",
+        "version,registry,expected",
         [
-            ("1.24-ubi9", "registry.redhat.io/ubi9/nginx-124:latest"),
-            ("1.24-ubi8", "registry.redhat.io/ubi8/nginx-124:latest"),
-            ("1.22-ubi9", "registry.redhat.io/ubi9/nginx-122:latest"),
-            ("1.22-ubi8", "registry.redhat.io/ubi8/nginx-122:latest"),
-            ("1.20-ubi9", "registry.redhat.io/ubi9/nginx-120:latest"),
-            ("1.20-ubi8", "registry.redhat.io/ubi8/nginx-120:latest"),
+            ("1.24-ubi9", "registry.redhat.io/ubi9/nginx-124:latest", True),
+            ("1.24-ubi8", "registry.redhat.io/ubi8/nginx-124:latest", True),
+            ("1.22-ubi9", "registry.redhat.io/ubi9/nginx-122:latest", True),
+            ("1.22-ubi8", "registry.redhat.io/ubi8/nginx-122:latest", True),
+            ("1.20-ubi9", "registry.redhat.io/ubi9/nginx-120:latest", True),
+            ("1.20-ubi8", "registry.redhat.io/ubi8/nginx-120: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

test/test_shared_helm_nginx_template.py

@@ -29,9 +29,9 @@
 class TestHelmNginxTemplate:
 
     def setup_method(self):
-        package_name = "nginx-template"
+        package_name = "redhat-nginx-template"
         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"
@@ -41,15 +41,15 @@ def teardown_method(self):
         self.hc_api.delete_project()
 
     def test_curl_connection(self):
-        if self.hc_api.oc_api.shared_cluster:
+        if self.hc_api.shared_cluster:
             pytest.skip("Do NOT test on shared cluster")
         new_version = VERSION
         if "micro" in VERSION:
             new_version = VERSION.replace("-micro", "")
-        self.hc_api.package_name = "nginx-imagestreams"
+        self.hc_api.package_name = "redhat-nginx-imagestreams"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "nginx-template"
+        self.hc_api.package_name = "redhat-nginx-template"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
@@ -65,13 +65,13 @@ def test_curl_connection(self):
         )
 
     def test_helm_connection(self):
-        self.hc_api.package_name = "nginx-imagestreams"
+        self.hc_api.package_name = "redhat-nginx-imagestreams"
         new_version = VERSION
         if "micro" in VERSION:
             new_version = VERSION.replace("-micro", "")
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation()
-        self.hc_api.package_name = "nginx-template"
+        self.hc_api.package_name = "redhat-nginx-template"
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={