Rename test_* python files for OpenShift to test_ocp.

Also VARS.* variables are used during the migration.

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

test/test_deploy_templates.py

@@ -0,0 +1,46 @@
+import pytest
+
+from container_ci_suite.openshift import OpenShiftAPI
+
+from conftest import VARS
+
+
+class TestDeployTemplate:
+    def setup_method(self):
+        self.oc_api = OpenShiftAPI(
+            pod_name_prefix=f"python-{VARS.SHORT_VERSION}-test",
+            version=VARS.VERSION_NO_MINIMAL,
+            shared_cluster=True,
+        )
+
+    def teardown_method(self):
+        self.oc_api.delete_project()
+
+    @pytest.mark.parametrize(
+        "template", ["django-postgresql.json", "django-postgresql-persistent.json"]
+    )
+    def test_python_template_inside_cluster(self, template):
+        assert self.oc_api.upload_image(VARS.DEPLOYED_PSQL_IMAGE, VARS.IMAGE_TAG)
+        service_name = f"python-{VARS.SHORT_VERSION}-test"
+        template_url = self.oc_api.get_raw_url_for_json(
+            container="django-ex",
+            dir="openshift/templates",
+            filename=template,
+            branch=VARS.BRANCH_TO_TEST,
+        )
+        assert self.oc_api.deploy_template_with_image(
+            image_name=VARS.IMAGE_NAME,
+            template=template_url,
+            name_in_template="python",
+            openshift_args=[
+                f"SOURCE_REPOSITORY_REF={VARS.BRANCH_TO_TEST}",
+                f"PYTHON_VERSION={VARS.VERSION_NO_MINIMAL}",
+                f"NAME={service_name}",
+                f"POSTGRESQL_VERSION={VARS.PSQL_VERSION}",
+            ],
+        )
+        assert self.oc_api.is_template_deployed(name_in_template=service_name)
+        assert self.oc_api.check_response_inside_cluster(
+            name_in_template=service_name,
+            expected_output="Welcome to your Django application on OpenShift",
+        )

test/test_imagestreams_quickstart.py

@@ -2,25 +2,20 @@
 
 from conftest import skip_helm_charts_tests, VARS
 
-DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-10-c8s:c8s"
-IMAGE_TAG = "postgresql:10"
-PSQL_VERSION = "10"
-BRANCH_TO_TEST = "2.2.x"
-
-if VARS.VERSION in ("3.11", "3.12", "3.12-minimal"):
-    DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-12-c8s"
-    IMAGE_TAG = "postgresql:12"
-    PSQL_VERSION = "12"
-    BRANCH_TO_TEST = "4.2.x"
 
 class TestHelmPythonDjangoAppTemplate:
-
     def setup_method(self):
         package_name = "redhat-python-django-application"
-        self.hc_api = HelmChartsAPI(path=VARS.TEST_DIR, package_name=package_name, tarball_dir=VARS.TEST_DIR, shared_cluster=True)
+        self.hc_api = HelmChartsAPI(
+            path=VARS.TEST_DIR,
+            package_name=package_name,
+            tarball_dir=VARS.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"
+            repo_url="https://github.com/sclorg/helm-charts",
+            repo_name="helm-charts",
+            subdir="charts/redhat",
         )
 
     def teardown_method(self):
@@ -37,8 +32,10 @@ def test_django_application_helm_test(self):
             values={
                 "python_version": f"{VARS.VERSION}{VARS.TAG}",
                 "namespace": self.hc_api.namespace,
-                "source_repository_ref": BRANCH_TO_TEST,
+                "source_repository_ref": VARS.BRANCH_TO_TEST,
             }
         )
         assert self.hc_api.is_s2i_pod_running(pod_name_prefix="django-example")
-        assert self.hc_api.test_helm_chart(expected_str=["Welcome to your Django application"])
+        assert self.hc_api.test_helm_chart(
+            expected_str=["Welcome to your Django application"]
+        )

test/test_ocp_deploy_templates.py

@@ -2,20 +2,20 @@
 
 from conftest import skip_helm_charts_tests, VARS
 
-BRANCH_TO_TEST = "2.2.x"
-
-if VARS.VERSION in ("3.11", "3.12", "3.12-minimal"):
-    BRANCH_TO_TEST = "4.2.x"
-
 
 class TestHelmPythonDjangoPsqlTemplate:
-
     def setup_method(self):
         package_name = "redhat-django-psql-persistent"
-        self.hc_api = HelmChartsAPI(path=VARS.TEST_DIR, package_name=package_name, tarball_dir=VARS.TEST_DIR, shared_cluster=True)
+        self.hc_api = HelmChartsAPI(
+            path=VARS.TEST_DIR,
+            package_name=package_name,
+            tarball_dir=VARS.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"
+            repo_url="https://github.com/sclorg/helm-charts",
+            repo_name="helm-charts",
+            subdir="charts/redhat",
         )
 
     def teardown_method(self):
@@ -35,8 +35,10 @@ def test_django_psql_helm_test(self):
             values={
                 "python_version": f"{VARS.VERSION}{VARS.TAG}",
                 "namespace": self.hc_api.namespace,
-                "source_repository_ref": BRANCH_TO_TEST,
+                "source_repository_ref": VARS.BRANCH_TO_TEST,
             }
         )
         assert self.hc_api.is_s2i_pod_running(pod_name_prefix="django-psql")
-        assert self.hc_api.test_helm_chart(expected_str=["Welcome to your Django application"])
+        assert self.hc_api.test_helm_chart(
+            expected_str=["Welcome to your Django application"]
+        )

test/test_helm_python_django_app.py renamed to test/test_ocp_helm_python_django_app.py

@@ -4,14 +4,20 @@
 
 from conftest import VARS
 
-class TestHelmRHELPythonImageStreams:
 
+class TestHelmRHELPythonImageStreams:
     def setup_method(self):
         package_name = "redhat-python-imagestreams"
-        self.hc_api = HelmChartsAPI(path=VARS.TEST_DIR, package_name=package_name, tarball_dir=VARS.TEST_DIR, shared_cluster=True)
+        self.hc_api = HelmChartsAPI(
+            path=VARS.TEST_DIR,
+            package_name=package_name,
+            tarball_dir=VARS.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"
+            repo_url="https://github.com/sclorg/helm-charts",
+            repo_name="helm-charts",
+            subdir="charts/redhat",
         )
 
     def teardown_method(self):
@@ -20,7 +26,10 @@ def teardown_method(self):
     @pytest.mark.parametrize(
         "version,registry",
         [
-            ("3.12-minimal-ubi10", "registry.redhat.io/ubi10/python-312-minimal:latest"),
+            (
+                "3.12-minimal-ubi10",
+                "registry.redhat.io/ubi10/python-312-minimal:latest",
+            ),
             ("3.12-ubi9", "registry.redhat.io/ubi9/python-312:latest"),
             ("3.12-ubi8", "registry.redhat.io/ubi8/python-312:latest"),
             ("3.11-ubi9", "registry.redhat.io/ubi9/python-311:latest"),

test/test_helm_python_django_psql_persistent.py renamed to test/test_ocp_helm_python_django_psql_persistent.py

@@ -0,0 +1,61 @@
+import pytest
+
+from container_ci_suite.openshift import OpenShiftAPI
+
+from conftest import VARS
+
+
+class TestImagestreamsQuickstart:
+    def setup_method(self):
+        self.oc_api = OpenShiftAPI(
+            pod_name_prefix=f"python-{VARS.SHORT_VERSION}-test",
+            version=VARS.VERSION_NO_MINIMAL,
+            shared_cluster=True,
+        )
+
+    def teardown_method(self):
+        self.oc_api.delete_project()
+
+    @pytest.mark.parametrize(
+        "template", ["django.json", "django-postgresql-persistent.json"]
+    )
+    def test_python_template_inside_cluster(self, template):
+        if self.oc_api.shared_cluster:
+            assert self.oc_api.upload_image_to_external_registry(
+                VARS.DEPLOYED_PSQL_IMAGE, VARS.IMAGE_TAG
+            )
+        else:
+            assert self.oc_api.upload_image(VARS.DEPLOYED_PSQL_IMAGE, VARS.IMAGE_TAG)
+        service_name = f"python-{VARS.SHORT_VERSION}-test"
+        template_url = self.oc_api.get_raw_url_for_json(
+            container="django-ex",
+            dir="openshift/templates",
+            filename=template,
+            branch=VARS.BRANCH_TO_TEST,
+        )
+        openshift_args = [
+            f"SOURCE_REPOSITORY_REF={VARS.BRANCH_TO_TEST}",
+            f"PYTHON_VERSION={VARS.VERSION_NO_MINIMAL}",
+            f"NAME={service_name}",
+        ]
+        if template != "django.json":
+            openshift_args = [
+                f"SOURCE_REPOSITORY_REF={VARS.BRANCH_TO_TEST}",
+                f"POSTGRESQL_VERSION={VARS.PSQL_VERSION}",
+                f"PYTHON_VERSION={VARS.VERSION_NO_MINIMAL}",
+                f"NAME={service_name}",
+                "DATABASE_USER=testu",
+                "DATABASE_PASSWORD=testp",
+            ]
+        assert self.oc_api.imagestream_quickstart(
+            imagestream_file="imagestreams/python-rhel.json",
+            template_file=template_url,
+            image_name=VARS.IMAGE_NAME,
+            name_in_template="python",
+            openshift_args=openshift_args,
+        )
+        assert self.oc_api.is_template_deployed(name_in_template=service_name)
+        assert self.oc_api.check_response_inside_cluster(
+            name_in_template=service_name,
+            expected_output="Welcome to your Django application on OpenShift",
+        )

test/test_helm_python_imagestreams.py renamed to test/test_ocp_helm_python_imagestreams.py

@@ -5,11 +5,10 @@
 
 # Replacement with 'test_latest_imagestreams'
 class TestLatestImagestreams:
-
     def setup_method(self):
         self.isc = ImageStreamChecker(working_dir=VARS.TEST_DIR.parent.parent)
 
     def test_latest_imagestream(self):
         self.latest_version = self.isc.get_latest_version()
-        assert self.latest_version != ""
+        assert self.latest_version
         self.isc.check_imagestreams(self.latest_version)