Remove constants module, move TAGS to conftest and TAG to VARS

Author: frenzymadness

manifest-minimal.yml

@@ -208,9 +208,6 @@ SYMLINK_RULES:
   - src: ../../test/conftest.py
     dest: test/conftest.py
 
-  - src: ../../test/constants.py
-    dest: test/constants.py
-
   - src: ../../test/__init__.py
     dest: test/__init__.py
 

manifest.yml

@@ -207,9 +207,6 @@ SYMLINK_RULES:
   - src: ../../test/conftest.py
     dest: test/conftest.py
 
-  - src: ../../test/constants.py
-    dest: test/constants.py
-
   - src: ../../test/__init__.py
     dest: test/__init__.py
 

test/conftest.py

@@ -9,15 +9,23 @@
 if not check_variables():
     sys.exit(1)
 
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10",
+}
+
 Vars = namedtuple("Vars", ["OS", "VERSION", "IMAGE_NAME", "IS_MINIMAL", "VERSION_NO_MINIMAL", "SHORT_VERSION", "TEST_DIR"])
 VERSION = os.getenv("VERSION")
+OS = os.getenv("TARGET").lower()
 VARS = Vars(
-    OS=os.getenv("TARGET").lower(),
+    OS=OS,
     VERSION=VERSION,
     IMAGE_NAME=os.getenv("IMAGE_NAME"),
     IS_MINIMAL="minimal" in VERSION,
     VERSION_NO_MINIMAL=VERSION.replace("-minimal", ""),
     SHORT_VERSION=VERSION.replace("-minimal", "").replace(".", ""),
+    TAG=TAGS.get(OS),
     TEST_DIR=Path(__file__).parent.absolute()
 )
 

test/constants.py

@@ -1,10 +1,7 @@
 from container_ci_suite.helm import HelmChartsAPI
 
-from constants import TAGS, BRANCH_TO_TEST
-from conftest import skip_helm_charts_tests, VARS
+from conftest import BRANCH_TO_TEST, skip_helm_charts_tests, VARS
 
-
-TAG = TAGS.get(VARS.OS)
 DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-10-c8s:c8s"
 IMAGE_TAG = "postgresql:10"
 PSQL_VERSION = "10"
@@ -37,7 +34,7 @@ def test_django_application_helm_test(self):
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
-                "python_version": f"{VARS.VERSION}{TAG}",
+                "python_version": f"{VARS.VERSION}{VARS.TAG}",
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": BRANCH_TO_TEST,
             }

test/test_helm_python_django_app.py

@@ -1,9 +1,7 @@
 from container_ci_suite.helm import HelmChartsAPI
 
-from constants import TAGS, BRANCH_TO_TEST
-from conftest import skip_helm_charts_tests, VARS
+from conftest import BRANCH_TO_TEST, skip_helm_charts_tests,VARS
 
-TAG = TAGS.get(VARS.OS)
 if VARS.VERSION in ("3.11", "3.12", "3.12-minimal"):
     BRANCH_TO_TEST = "4.2.x"
 
@@ -33,7 +31,7 @@ def test_django_psql_helm_test(self):
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
-                "python_version": f"{VARS.VERSION}{TAG}",
+                "python_version": f"{VARS.VERSION}{VARS.TAG}",
                 "namespace": self.hc_api.namespace,
                 "source_repository_ref": BRANCH_TO_TEST,
             }

test/test_helm_python_django_psql_persistent.py

@@ -3,8 +3,7 @@
 
 from container_ci_suite.openshift import OpenShiftAPI
 
-from constants import TAGS, BRANCH_TO_TEST
-from conftest import VARS
+from conftest import BRANCH_TO_TEST,VARS
 
 DEPLOYED_PSQL_IMAGE = "quay.io/sclorg/postgresql-10-c8s:c8s"
 IMAGE_TAG = "postgresql:10"
@@ -16,8 +15,6 @@
     IMAGE_TAG = "postgresql:12"
     PSQL_VERSION = "12"
 
-TAG = TAGS.get(VARS.OS, None)
-
 
 # Replacement with 'test_python_s2i_templates'
 class TestImagestreamsQuickstart: