Moving PSQL information to VARS

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

Author: phracek

test/conftest.py

@@ -10,38 +10,44 @@
 if not check_variables():
     sys.exit(1)
 
-Vars = namedtuple("Vars", [
-    "OS", "VERSION", "IMAGE_NAME", "IS_MINIMAL", "VERSION_NO_MINIMAL", "SHORT_VERSION", "TEST_DIR"
-])
+OS = os.getenv("TARGET").lower()
 VERSION = os.getenv("VERSION")
-VARS = Vars(
-    OS=os.getenv("TARGET").lower(),
-    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(".", ""),
-    TEST_DIR=Path(__file__).parent.absolute()
-)
-
+IMAGE_TAG = "15-c9s"
+PGSQL_IMAGE_TAG = f"postgresql:{IMAGE_TAG}"
+DEPLOYED_PGSQL_IMAGE = f"quay.io/sclorg/{PGSQL_IMAGE_TAG}"
 TAGS = {
     "rhel8": "-ubi8",
     "rhel9": "-ubi9",
     "rhel10": "-ubi10",
 }
-
 MYSQL_TAGS = {
     "rhel8": "-el8",
     "rhel9": "-el9",
     "rhel10": "-el10",
 }
 
-DEPLOYED_PGSQL_IMAGE = "quay.io/sclorg/postgresql-15-c9s"
+Vars = namedtuple("Vars", [
+    "OS", "VERSION", "TAG", "MYSQL_TAG", "PGSQL_IMAGE_TAG",
+    "DEPLOYED_PGSQL_IMAGE", "IMAGE_NAME", "IS_MINIMAL",
+    "VERSION_NO_MINIMAL", "SHORT_VERSION", "TEST_DIR"
+])
+
+
+VARS = Vars(
+    OS=OS,
+    VERSION=VERSION,
+    TAG=TAGS.get(OS),
+    MYSQL_TAG=MYSQL_TAGS.get(OS),
+    PGSQL_IMAGE_TAG=PGSQL_IMAGE_TAG,
+    DEPLOYED_PGSQL_IMAGE=DEPLOYED_PGSQL_IMAGE,
+    IMAGE_NAME=os.getenv("IMAGE_NAME"),
+    IS_MINIMAL="minimal" in VERSION,
+    VERSION_NO_MINIMAL=VERSION.replace("-minimal", ""),
+    SHORT_VERSION=VERSION.replace("-minimal", "").replace(".", ""),
+    TEST_DIR=Path(__file__).parent.absolute()
+)
 
-PGSQL_IMAGE_TAG = "postgresql:15-c9s"
-IMAGE_TAG = "15-c9s"
 
 def skip_for_minimal():
     if "minimal" in VARS.VERSION:
         skip("This test is not available for NodeJS minimal container")
-

test/test_container_apps.py

@@ -8,6 +8,7 @@
 
 from conftest import VARS, skip_for_minimal
 
+
 test_app = VARS.TEST_DIR / "test-app"
 test_binary = VARS.TEST_DIR / "test-binary"
 test_express_webapp = VARS.TEST_DIR / "test-express-webapp"
@@ -247,6 +248,7 @@ def test_node_cmd_development(self, node_env, init_wrapper, node_cmd):
         assert re.search(f"INIT_WRAPPER={init_wrapper}", logs)
         assert re.search(f"NODE_CMD={node_cmd}", logs)
 
+
 class TestNodeJSAppsWithNodeEnvDevelopmentContainer:
 
     def setup_method(self):

test/test_container_basics.py

@@ -7,6 +7,7 @@
 
 from conftest import VARS, skip_for_minimal
 
+
 test_fips = VARS.TEST_DIR / "test-fips"
 
 

test/test_ocp_imagestreams_quickstart.py

@@ -2,7 +2,7 @@
 
 from container_ci_suite.openshift import OpenShiftAPI
 
-from conftest import VARS, DEPLOYED_PGSQL_IMAGE, PGSQL_IMAGE_TAG, IMAGE_TAG
+from conftest import VARS
 
 
 # Replacement with 'test_python_s2i_templates'
@@ -26,7 +26,7 @@ def teardown_method(self):
         ]
     )
     def test_nodejs_template_inside_cluster(self, template):
-        assert self.oc_api.upload_image(DEPLOYED_PGSQL_IMAGE, PGSQL_IMAGE_TAG)
+        assert self.oc_api.upload_image(VARS.DEPLOYED_PGSQL_IMAGE, VARS.PGSQL_IMAGE_TAG)
         service_name = f"nodejs-{VARS.VERSION}-example"
         template_url = self.oc_api.get_raw_url_for_json(
             container="nodejs-ex", dir="openshift/templates", filename=template, branch="master"
@@ -41,7 +41,7 @@ def test_nodejs_template_inside_cluster(self, template):
             openshift_args = [
                 "SOURCE_REPOSITORY_URL=https://github.com/sclorg/nodejs-ex.git",
                 "SOURCE_REPOSITORY_REF=master",
-                f"POSTGRESQL_VERSION={IMAGE_TAG}",
+                f"POSTGRESQL_VERSION={VARS.IMAGE_TAG}",
                 f"NODEJS_VERSION={VARS.VERSION_NO_MINIMAL}",
                 f"NAME={service_name}",
                 "DATABASE_USER=testu",