The symlinks are:

phracek · phracek · commit 9eee22a50b4e · 2025-10-13T10:10:33.000+02:00
./run-pytest
./test_container_basics.py
./test_container_s2i.py
./conftest.py

Use proper python version on Fedora and CentOS Stream 9, 10

Replace constants.py with conftest.py

Signed-off-by: Petr "Stone" Hracek &lt;phracek@redhat.com&gt;
diff --git a/5.26-mod_fcgid/test/conftest.py b/5.26-mod_fcgid/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.26-mod_fcgid/test/constants.py b/5.26-mod_fcgid/test/constants.py
diff --git a/5.26-mod_fcgid/test/run-pytest b/5.26-mod_fcgid/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/5.26-mod_fcgid/test/test_container_basics.py b/5.26-mod_fcgid/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/5.26-mod_fcgid/test/test_container_s2i.py b/5.26-mod_fcgid/test/test_container_s2i.py
@@ -0,0 +1 @@
+../../test/test_container_s2i.py
diff --git a/5.26/test/conftest.py b/5.26/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.26/test/constants.py b/5.26/test/constants.py
diff --git a/5.30-mod_fcgid/test/conftest.py b/5.30-mod_fcgid/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.30-mod_fcgid/test/constants.py b/5.30-mod_fcgid/test/constants.py
diff --git a/5.30-mod_fcgid/test/run-pytest b/5.30-mod_fcgid/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/5.30-mod_fcgid/test/test_container_basics.py b/5.30-mod_fcgid/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/5.30-mod_fcgid/test/test_container_s2i.py b/5.30-mod_fcgid/test/test_container_s2i.py
@@ -0,0 +1 @@
+../../test/test_container_s2i.py
diff --git a/5.30/test/conftest.py b/5.30/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.30/test/constants.py b/5.30/test/constants.py
diff --git a/5.30/test/run-pytest b/5.30/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/5.30/test/test_container_basics.py b/5.30/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/5.30/test/test_container_s2i.py b/5.30/test/test_container_s2i.py
@@ -0,0 +1 @@
+../../test/test_container_s2i.py
diff --git a/5.32/test/conftest.py b/5.32/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.32/test/constants.py b/5.32/test/constants.py
diff --git a/5.32/test/run-pytest b/5.32/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/5.32/test/test_container_basics.py b/5.32/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/5.32/test/test_container_s2i.py b/5.32/test/test_container_s2i.py
@@ -0,0 +1 @@
+../../test/test_container_s2i.py
diff --git a/5.34/test/conftest.py b/5.34/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.34/test/constants.py b/5.34/test/constants.py
diff --git a/5.34/test/run-pytest b/5.34/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/5.34/test/test_container_basics.py b/5.34/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/5.34/test/test_container_s2i.py b/5.34/test/test_container_s2i.py
@@ -0,0 +1 @@
+../../test/test_container_s2i.py
diff --git a/5.36/test/conftest.py b/5.36/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.36/test/constants.py b/5.36/test/constants.py
diff --git a/5.36/test/run-pytest b/5.36/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/5.36/test/test_container_basics.py b/5.36/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/5.36/test/test_container_s2i.py b/5.36/test/test_container_s2i.py
@@ -0,0 +1 @@
+../../test/test_container_s2i.py
diff --git a/5.38/test/conftest.py b/5.38/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.38/test/constants.py b/5.38/test/constants.py
diff --git a/5.38/test/run-pytest b/5.38/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/5.38/test/test_container_basics.py b/5.38/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/5.38/test/test_container_s2i.py b/5.38/test/test_container_s2i.py
@@ -0,0 +1 @@
+../../test/test_container_s2i.py
diff --git a/5.40/test/conftest.py b/5.40/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/5.40/test/constants.py b/5.40/test/constants.py
diff --git a/5.40/test/run-pytest b/5.40/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/5.40/test/test_container_basics.py b/5.40/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/5.40/test/test_container_s2i.py b/5.40/test/test_container_s2i.py
@@ -0,0 +1 @@
+../../test/test_container_s2i.py
diff --git a/test/conftest.py b/test/conftest.py
@@ -0,0 +1,33 @@
+from collections import namedtuple
+import os
+from pathlib import Path
+import sys
+
+from container_ci_suite.utils import check_variables
+
+if not check_variables():
+    sys.exit(1)
+
+Vars = namedtuple("Vars", ["OS", "VERSION", "IMAGE_NAME", "IS_MINIMAL", "VERSION_NO_FCGID", "SHORT_VERSION", "TEST_DIR"])
+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_FCGID=VERSION.replace("-mod_fcgid", ""),
+    SHORT_VERSION=VERSION.replace("-mod_fcgid", "").replace(".", ""),
+    TEST_DIR=Path(__file__).parent.absolute()
+)
+
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10",
+}
+
+MYSQL_TAGS = {
+    "rhel8": "-el8",
+    "rhel9": "-el9",
+    "rhel10": "-el10",
+}
diff --git a/test/constants.py b/test/constants.py
diff --git a/test/run-pytest b/test/run-pytest
@@ -2,10 +2,14 @@
 #
 # IMAGE_NAME specifies a name of the candidate image used for testing.
 # The image has to be available before this script is executed.
-# VERSION specifies the major version of the MariaDB in format of X.Y
-# OS specifies RHEL version (e.g. OS=rhel7)
+# SINGLE_VERSION specifies the major version of httpd
+# OS specifies RHEL version (e.g. OS=rhel8)
 #
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
-cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_container_*.py
+PYTHON_VERSION="3.12"
+if [[ ! -f "/usr/bin/python$PYTHON_VERSION" ]]; then
+  PYTHON_VERSION="3.13"
+fi
+cd "${THISDIR}" && "python${PYTHON_VERSION}" -m pytest -s -rA --showlocals -vv test_container_*.py
diff --git a/test/settings.py b/test/settings.py
diff --git a/test/test_container_basics.py b/test/test_container_basics.py
@@ -1,29 +1,15 @@
-import os
-import sys
-
-from pathlib import Path
-
 import pytest
 
 from container_ci_suite.container_lib import ContainerTestLib
-from container_ci_suite.utils import check_variables
 from container_ci_suite.engines.podman_wrapper import PodmanCLIWrapper
 
-
-if not check_variables():
-    sys.exit(1)
-
-
-TEST_DIR = Path(__file__).parent.absolute()
-VERSION = os.getenv("VERSION")
-OS = os.getenv("OS").lower()
-IMAGE_NAME = os.getenv("IMAGE_NAME")
+from conftest import VARS
 
 
 class TestPerlContainer:
 
     def setup_method(self):
-        self.app = ContainerTestLib(image_name=IMAGE_NAME, s2i_image=True)
+        self.app = ContainerTestLib(image_name=VARS.IMAGE_NAME, s2i_image=True)
 
     def teardown_method(self):
         self.app.cleanup()
@@ -36,14 +22,14 @@ def test_run_s2i_usage(self):
     # # test_docker_run_usage
     def test_docker_run_usage(self):
         assert PodmanCLIWrapper.call_podman_command(
-            cmd=f"run --rm {IMAGE_NAME} &>/dev/null",
+            cmd=f"run --rm {VARS.IMAGE_NAME} &>/dev/null",
             return_output=False
         ) == 0
 
 
     def test_scl_usage(self):
-        assert f"v{VERSION}" in PodmanCLIWrapper.podman_run_command(
-            f"--rm {IMAGE_NAME} /bin/bash -c 'perl --version'"
+        assert f"v{VARS.VERSION}" in PodmanCLIWrapper.podman_run_command(
+            f"--rm {VARS.IMAGE_NAME} /bin/bash -c 'perl --version'"
         )
 
     @pytest.mark.parametrize(
@@ -55,7 +41,7 @@ def test_scl_usage(self):
     )
     def test_dockerfiles(self, dockerfile):
         assert self.app.build_test_container(
-            dockerfile=TEST_DIR / "examples/from-dockerfile" / VERSION / dockerfile, app_url="https://github.com/sclorg/dancer-ex.git",
+            dockerfile=VARS.TEST_DIR / "examples/from-dockerfile" / VARS.VERSION / dockerfile, app_url="https://github.com/sclorg/dancer-ex.git",
             app_dir="app-src"
         )
         assert self.app.test_app_dockerfile()
diff --git a/test/test_container_s2i.py b/test/test_container_s2i.py
@@ -1,6 +1,4 @@
-import os
 import re
-import sys
 from time import sleep
 
 import pytest
@@ -11,36 +9,36 @@
 from container_ci_suite.engines.podman_wrapper import PodmanCLIWrapper
 from container_ci_suite.engines.container import ContainerImage
 
-from settings import IMAGE_NAME, TEST_DIR
+from conftest import VARS
 
-sample_test_app = TEST_DIR / "sample-test-app"
-bin_app = TEST_DIR / "binpath"
-fcgi = TEST_DIR / "fcgi"
-psgi = TEST_DIR / "psgi"
-psgi_hot_deploy = TEST_DIR / "psgi-hot_deploy"
-psgi_variables = TEST_DIR / "psgi-variables"
-warningonstderr = TEST_DIR / "warningonstderr"
+sample_test_app = VARS.TEST_DIR / "sample-test-app"
+bin_app = VARS.TEST_DIR / "binpath"
+fcgi = VARS.TEST_DIR / "fcgi"
+psgi = VARS.TEST_DIR / "psgi"
+psgi_hot_deploy = VARS.TEST_DIR / "psgi-hot_deploy"
+psgi_variables = VARS.TEST_DIR / "psgi-variables"
+warningonstderr = VARS.TEST_DIR / "warningonstderr"
 
 
 def build_npm_app(app_path: Path) -> ContainerTestLib:
-    container_lib = ContainerTestLib(IMAGE_NAME)
+    container_lib = ContainerTestLib(VARS.IMAGE_NAME)
     s2i_app = container_lib.build_as_df(
         app_path=app_path,
         s2i_args=f"--pull-policy=never {container_lib.build_s2i_npm_variables()}",
-        src_image=IMAGE_NAME,
-        dst_image=f"{IMAGE_NAME}-testapp"
+        src_image=VARS.IMAGE_NAME,
+        dst_image=f"{VARS.IMAGE_NAME}-testapp"
     )
     return s2i_app
 
 
 def build_s2i_app(app_path: Path, container_args: str = "") -> ContainerTestLib:
-    container_lib = ContainerTestLib(IMAGE_NAME)
+    container_lib = ContainerTestLib(VARS.IMAGE_NAME)
     app_name = app_path.name
     s2i_app = container_lib.build_as_df(
         app_path=app_path,
         s2i_args=f"--pull-policy=never {container_args} {container_lib.build_s2i_npm_variables()}",
-        src_image=IMAGE_NAME,
-        dst_image=f"{IMAGE_NAME}-{app_name}"
+        src_image=VARS.IMAGE_NAME,
+        dst_image=f"{VARS.IMAGE_NAME}-{app_name}"
     )
     return s2i_app
 
@@ -59,7 +57,7 @@ def test_run_s2i_usage(self):
     # test_docker_run_usage
     def test_docker_run_usage(self):
         assert PodmanCLIWrapper.call_podman_command(
-            cmd=f"run --rm {IMAGE_NAME} &>/dev/null",
+            cmd=f"run --rm {VARS.IMAGE_NAME} &>/dev/null",
             return_output=False
         ) == 0
 
@@ -131,7 +129,7 @@ def teardown_method(self):
         self.s2i_app.cleanup()
 
     def test_npm_works(self):
-        assert self.s2i_app.npm_works(image_name=IMAGE_NAME)
+        assert self.s2i_app.npm_works(image_name=VARS.IMAGE_NAME)
 
 @pytest.mark.parametrize(
     "application_path,container_args,hot_deploy",
diff --git a/test/test_ocp_dancer_ex_standalone.py b/test/test_ocp_dancer_ex_standalone.py
@@ -1,41 +1,20 @@
-import os
-import sys
-
-import pytest
-
-from container_ci_suite.utils import check_variables
 from container_ci_suite.openshift import OpenShiftAPI
 
-if not check_variables():
-    print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
-    sys.exit(1)
-
-
-VERSION = os.getenv("VERSION")
-IMAGE_NAME = os.getenv("IMAGE_NAME")
-OS = os.getenv("TARGET")
-
-if VERSION == "5.30-mod_fcgid":
-    VERSION = "5.30"
-
-if VERSION == "5.26-mod_fcgid":
-    VERSION = "5.26"
-
-new_version = VERSION.replace(".", "")
+from conftest import VARS
 
 # Replacement with 'test_python_s2i_app_ex'
 class TestPerlDancerExTemplate:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix=f"perl-{new_version}-testing", version=VERSION, shared_cluster=True)
+        self.oc_api = OpenShiftAPI(pod_name_prefix=f"perl-{VARS.SHORT_VERSION}-testing", version=VARS.VERSION, shared_cluster=True)
 
     def teardown_method(self):
         self.oc_api.delete_project()
 
     def test_dancer_ex_template_inside_cluster(self):
-        service_name = f"perl-{new_version}-testing"
+        service_name = f"perl-{VARS.SHORT_VERSION}-testing"
         assert self.oc_api.deploy_s2i_app(
-            image_name=IMAGE_NAME, app="https://github.com/sclorg/dancer-ex.git",
+            image_name=VARS.IMAGE_NAME, app="https://github.com/sclorg/dancer-ex.git",
             context=".",
             service_name=service_name
         )
