sclorg · phracek · Oct 29, 2025 · Oct 15, 2025 · Oct 15, 2025 · Oct 15, 2025
diff --git a/7.3/test/conftest.py b/7.3/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/7.3/test/constants.py b/7.3/test/constants.py
diff --git a/7.3/test/run-pytest b/7.3/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/7.3/test/test_container_application.py b/7.3/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/7.3/test/test_container_basics.py b/7.3/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/7.3/test/test_container_ssl.py b/7.3/test/test_container_ssl.py
@@ -0,0 +1 @@
+../../test/test_container_ssl.py
diff --git a/7.3/test/test_ocp_php_deploy_templates.py b/7.3/test/test_ocp_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_deploy_templates.py
diff --git a/7.3/test/test_ocp_php_latest_imagestreams.py b/7.3/test/test_ocp_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_latest_imagestreams.py
diff --git a/7.3/test/test_ocp_php_s2i_imagestreams.py b/7.3/test/test_ocp_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_imagestreams.py
diff --git a/7.3/test/test_ocp_php_s2i_integration.py b/7.3/test/test_ocp_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_integration.py
diff --git a/7.3/test/test_ocp_shared_helm_cakephp_application.py b/7.3/test/test_ocp_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_cakephp_application.py
diff --git a/7.3/test/test_ocp_shared_helm_chart_imagestreams.py b/7.3/test/test_ocp_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_chart_imagestreams.py
diff --git a/7.3/test/test_php_deploy_templates.py b/7.3/test/test_php_deploy_templates.py
diff --git a/7.3/test/test_php_latest_imagestreams.py b/7.3/test/test_php_latest_imagestreams.py
diff --git a/7.3/test/test_php_s2i_imagestreams.py b/7.3/test/test_php_s2i_imagestreams.py
diff --git a/7.3/test/test_php_s2i_integration.py b/7.3/test/test_php_s2i_integration.py
diff --git a/7.4/test/conftest.py b/7.4/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/7.4/test/run-pytest b/7.4/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/7.4/test/test_container_application.py b/7.4/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/7.4/test/test_container_basics.py b/7.4/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/7.4/test/test_container_ssl.py b/7.4/test/test_container_ssl.py
@@ -0,0 +1 @@
+../../test/test_container_ssl.py
diff --git a/7.4/test/test_ocp_php_deploy_templates.py b/7.4/test/test_ocp_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_deploy_templates.py
diff --git a/7.4/test/test_ocp_php_latest_imagestreams.py b/7.4/test/test_ocp_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_latest_imagestreams.py
diff --git a/7.4/test/test_ocp_php_s2i_imagestreams.py b/7.4/test/test_ocp_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_imagestreams.py
diff --git a/7.4/test/test_ocp_php_s2i_integration.py b/7.4/test/test_ocp_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_integration.py
diff --git a/7.4/test/test_ocp_shared_helm_cakephp_application.py b/7.4/test/test_ocp_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_cakephp_application.py
diff --git a/7.4/test/test_ocp_shared_helm_chart_imagestreams.py b/7.4/test/test_ocp_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_chart_imagestreams.py
diff --git a/7.4/test/test_php_deploy_templates.py b/7.4/test/test_php_deploy_templates.py
diff --git a/7.4/test/test_php_latest_imagestreams.py b/7.4/test/test_php_latest_imagestreams.py
diff --git a/7.4/test/test_php_s2i_imagestreams.py b/7.4/test/test_php_s2i_imagestreams.py
diff --git a/7.4/test/test_php_s2i_integration.py b/7.4/test/test_php_s2i_integration.py
diff --git a/7.4/test/test_shared_helm_cakephp_application.py b/7.4/test/test_shared_helm_cakephp_application.py
diff --git a/7.4/test/test_shared_helm_chart_imagestreams.py b/7.4/test/test_shared_helm_chart_imagestreams.py
diff --git a/8.0/test/conftest.py b/8.0/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/8.0/test/constants.py b/8.0/test/constants.py
diff --git a/8.0/test/run-pytest b/8.0/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/8.0/test/test_container_application.py b/8.0/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/8.0/test/test_container_basics.py b/8.0/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/8.0/test/test_container_ssl.py b/8.0/test/test_container_ssl.py
@@ -0,0 +1 @@
+../../test/test_container_ssl.py
diff --git a/8.0/test/test_ocp_php_deploy_templates.py b/8.0/test/test_ocp_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_deploy_templates.py
diff --git a/8.0/test/test_ocp_php_latest_imagestreams.py b/8.0/test/test_ocp_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_latest_imagestreams.py
diff --git a/8.0/test/test_ocp_php_s2i_imagestreams.py b/8.0/test/test_ocp_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_imagestreams.py
diff --git a/8.0/test/test_ocp_php_s2i_integration.py b/8.0/test/test_ocp_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_integration.py
diff --git a/8.0/test/test_ocp_shared_helm_cakephp_application.py b/8.0/test/test_ocp_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_cakephp_application.py
diff --git a/8.0/test/test_ocp_shared_helm_chart_imagestreams.py b/8.0/test/test_ocp_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_chart_imagestreams.py
diff --git a/8.0/test/test_php_deploy_templates.py b/8.0/test/test_php_deploy_templates.py
diff --git a/8.0/test/test_php_latest_imagestreams.py b/8.0/test/test_php_latest_imagestreams.py
diff --git a/8.0/test/test_php_s2i_imagestreams.py b/8.0/test/test_php_s2i_imagestreams.py
diff --git a/8.0/test/test_php_s2i_integration.py b/8.0/test/test_php_s2i_integration.py
diff --git a/8.0/test/test_shared_helm_cakephp_application.py b/8.0/test/test_shared_helm_cakephp_application.py
diff --git a/8.0/test/test_shared_helm_chart_imagestreams.py b/8.0/test/test_shared_helm_chart_imagestreams.py
diff --git a/8.1/test/conftest.py b/8.1/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/8.1/test/constants.py b/8.1/test/constants.py
diff --git a/8.1/test/run-pytest b/8.1/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/8.1/test/test_container_application.py b/8.1/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/8.1/test/test_container_basics.py b/8.1/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/8.1/test/test_container_ssl.py b/8.1/test/test_container_ssl.py
@@ -0,0 +1 @@
+../../test/test_container_ssl.py
diff --git a/8.1/test/test_ocp_php_deploy_templates.py b/8.1/test/test_ocp_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_deploy_templates.py
diff --git a/8.1/test/test_ocp_php_latest_imagestreams.py b/8.1/test/test_ocp_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_latest_imagestreams.py
diff --git a/8.1/test/test_ocp_php_s2i_imagestreams.py b/8.1/test/test_ocp_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_imagestreams.py
diff --git a/8.1/test/test_ocp_php_s2i_integration.py b/8.1/test/test_ocp_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_integration.py
diff --git a/8.1/test/test_ocp_shared_helm_cakephp_application.py b/8.1/test/test_ocp_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_cakephp_application.py
diff --git a/8.1/test/test_ocp_shared_helm_chart_imagestreams.py b/8.1/test/test_ocp_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_chart_imagestreams.py
diff --git a/8.1/test/test_php_deploy_templates.py b/8.1/test/test_php_deploy_templates.py
diff --git a/8.1/test/test_php_latest_imagestreams.py b/8.1/test/test_php_latest_imagestreams.py
diff --git a/8.1/test/test_php_s2i_imagestreams.py b/8.1/test/test_php_s2i_imagestreams.py
diff --git a/8.1/test/test_php_s2i_integration.py b/8.1/test/test_php_s2i_integration.py
diff --git a/8.1/test/test_shared_helm_cakephp_application.py b/8.1/test/test_shared_helm_cakephp_application.py
diff --git a/8.1/test/test_shared_helm_chart_imagestreams.py b/8.1/test/test_shared_helm_chart_imagestreams.py
diff --git a/8.2/test/conftest.py b/8.2/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/8.2/test/constants.py b/8.2/test/constants.py
diff --git a/8.2/test/run-pytest b/8.2/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/8.2/test/test_container_application.py b/8.2/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/8.2/test/test_container_basics.py b/8.2/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/8.2/test/test_container_ssl.py b/8.2/test/test_container_ssl.py
@@ -0,0 +1 @@
+../../test/test_container_ssl.py
diff --git a/8.2/test/test_ocp_php_deploy_templates.py b/8.2/test/test_ocp_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_deploy_templates.py
diff --git a/8.2/test/test_ocp_php_latest_imagestreams.py b/8.2/test/test_ocp_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_latest_imagestreams.py
diff --git a/8.2/test/test_ocp_php_s2i_imagestreams.py b/8.2/test/test_ocp_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_imagestreams.py
diff --git a/8.2/test/test_ocp_php_s2i_integration.py b/8.2/test/test_ocp_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_integration.py
diff --git a/8.2/test/test_ocp_shared_helm_cakephp_application.py b/8.2/test/test_ocp_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_cakephp_application.py
diff --git a/8.2/test/test_ocp_shared_helm_chart_imagestreams.py b/8.2/test/test_ocp_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_chart_imagestreams.py
diff --git a/8.2/test/test_php_deploy_templates.py b/8.2/test/test_php_deploy_templates.py
diff --git a/8.2/test/test_php_latest_imagestreams.py b/8.2/test/test_php_latest_imagestreams.py
diff --git a/8.2/test/test_php_s2i_imagestreams.py b/8.2/test/test_php_s2i_imagestreams.py
diff --git a/8.2/test/test_php_s2i_integration.py b/8.2/test/test_php_s2i_integration.py
diff --git a/8.2/test/test_shared_helm_cakephp_application.py b/8.2/test/test_shared_helm_cakephp_application.py
diff --git a/8.2/test/test_shared_helm_chart_imagestreams.py b/8.2/test/test_shared_helm_chart_imagestreams.py
diff --git a/8.3/test/conftest.py b/8.3/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/8.3/test/constants.py b/8.3/test/constants.py
diff --git a/8.3/test/run-pytest b/8.3/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/8.3/test/test_container_application.py b/8.3/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/8.3/test/test_container_basics.py b/8.3/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/8.3/test/test_container_ssl.py b/8.3/test/test_container_ssl.py
@@ -0,0 +1 @@
+../../test/test_container_ssl.py
diff --git a/8.3/test/test_ocp_php_deploy_templates.py b/8.3/test/test_ocp_php_deploy_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_deploy_templates.py
diff --git a/8.3/test/test_ocp_php_latest_imagestreams.py b/8.3/test/test_ocp_php_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_latest_imagestreams.py
diff --git a/8.3/test/test_ocp_php_s2i_imagestreams.py b/8.3/test/test_ocp_php_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_imagestreams.py
diff --git a/8.3/test/test_ocp_php_s2i_integration.py b/8.3/test/test_ocp_php_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_php_s2i_integration.py
diff --git a/8.3/test/test_ocp_shared_helm_cakephp_application.py b/8.3/test/test_ocp_shared_helm_cakephp_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_cakephp_application.py
diff --git a/8.3/test/test_ocp_shared_helm_chart_imagestreams.py b/8.3/test/test_ocp_shared_helm_chart_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_shared_helm_chart_imagestreams.py
diff --git a/8.3/test/test_php_deploy_templates.py b/8.3/test/test_php_deploy_templates.py
diff --git a/8.3/test/test_php_latest_imagestreams.py b/8.3/test/test_php_latest_imagestreams.py
diff --git a/8.3/test/test_php_s2i_imagestreams.py b/8.3/test/test_php_s2i_imagestreams.py
diff --git a/8.3/test/test_php_s2i_integration.py b/8.3/test/test_php_s2i_integration.py
diff --git a/8.3/test/test_shared_helm_cakephp_application.py b/8.3/test/test_shared_helm_cakephp_application.py
diff --git a/8.3/test/test_shared_helm_chart_imagestreams.py b/8.3/test/test_shared_helm_chart_imagestreams.py
diff --git a/test/conftest.py b/test/conftest.py
@@ -0,0 +1,47 @@
+import os
+import sys
+
+from pathlib import Path
+from collections import namedtuple
+from pytest import skip
+
+from container_ci_suite.utils import check_variables
+
+if not check_variables():
+    sys.exit(1)
+
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10",
+}
+
+Vars = namedtuple(
+    "Vars", [
+        "OS", "TAG", "VERSION", "IMAGE_NAME", "IS_MINIMAL",
+        "SHORT_VERSION", "TEST_DIR", "BRANCH_TO_TEST", "CHECK_MSG"
+    ]
+)
+VERSION = os.getenv("VERSION")
+OS = os.getenv("TARGET").lower()
+
+BRANCH_TO_TEST = "4.X"
+if VERSION == "8.2" or VERSION == "8.3":
+    BRANCH_TO_TEST = "5.X"
+
+VARS = Vars(
+    OS=OS,
+    TAG=TAGS.get(OS),
+    VERSION=VERSION,
+    IMAGE_NAME=os.getenv("IMAGE_NAME"),
+    IS_MINIMAL="minimal" in VERSION,
+    SHORT_VERSION=VERSION.replace(".", ""),
+    TEST_DIR=Path(__file__).parent.absolute(),
+    BRANCH_TO_TEST=BRANCH_TO_TEST,
+    CHECK_MSG="Welcome to CakePHP",
+)
+
+
+def skip_clear_env_tests():
+    if VARS.OS == "rhel8" and VERSION == "8.2":
+        skip(f"Skipping clear env tests for {VARS.VERSION} on {VARS.OS}.")
diff --git a/test/constants.py b/test/constants.py
diff --git a/test/run-openshift-pytest b/test/run-openshift-pytest
@@ -8,4 +8,4 @@
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 
-cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_*.py
+cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_ocp_*.py
diff --git a/test/run-pytest b/test/run-pytest
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# IMAGE_NAME specifies a name of the candidate image used for testing.
+# The image has to be available before this script is executed.
+# SINGLE_VERSION specifies the major version of httpd
+# OS specifies RHEL version (e.g. OS=rhel8)
+#
+
+THISDIR=$(dirname ${BASH_SOURCE[0]})
+
+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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../test/test_ocp_shared_helm_cakephp_application.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../test/test_ocp_shared_helm_chart_imagestreams.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@

		THISDIR=$(dirname ${BASH_SOURCE[0]})

		cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_*.py
		cd "${THISDIR}" && python3.12 -m pytest -s -rA --showlocals -vv test_ocp_*.py