Add TAG to VARS so we should not imported separatelly

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

Author: phracek

test/conftest.py

@@ -10,29 +10,31 @@
 if not check_variables():
     sys.exit(1)
 
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10",
+}
+
 Vars = namedtuple(
     "Vars", [
-        "OS", "VERSION", "IMAGE_NAME", "VERSION_NO_MICRO", "SHORT_VERSION", "TEST_DIR"
+        "OS", "TAG", "VERSION", "IMAGE_NAME", "VERSION_NO_MICRO", "SHORT_VERSION", "TEST_DIR"
     ]
 )
+OS = os.getenv("TARGET").lower()
 VERSION = os.getenv("VERSION")
 BRANCH_TO_TEST = "master"
 
 VARS = Vars(
-    OS=os.getenv("TARGET").lower(),
+    OS=OS,
+    TAG=TAGS.get(OS),
     VERSION=VERSION,
     IMAGE_NAME=os.getenv("IMAGE_NAME"),
     VERSION_NO_MICRO=VERSION.replace("-micro", ""),
     SHORT_VERSION=VERSION.replace("-micro", "").replace(".", ""),
     TEST_DIR=Path(__file__).parent.absolute(),
 )
 
-TAGS = {
-    "rhel8": "-ubi8",
-    "rhel9": "-ubi9",
-    "rhel10": "-ubi10",
-}
-
 
 def skip_clear_env_tests():
     if VARS.OS == "rhel8" and VERSION == "8.2":

test/test_ocp_shared_helm_template.py

@@ -1,6 +1,6 @@
 from container_ci_suite.helm import HelmChartsAPI
 
-from conftest import VARS, TAGS
+from conftest import VARS
 
 
 class TestHelmNginxTemplate:
@@ -30,7 +30,7 @@ def test_helm_connection(self):
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
-                "nginx_version": f"{VARS.VERSION_NO_MICRO}{TAGS.get(VARS.OS)}",
+                "nginx_version": f"{VARS.VERSION_NO_MICRO}{VARS.TAG}",
                 "namespace": self.hc_api.namespace
             }
         )