sclorg · phracek · Nov 6, 2025 · Nov 6, 2025 · Nov 6, 2025 · Nov 7, 2025
diff --git a/2.5/test/conftest.py b/2.5/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/2.5/test/constants.py b/2.5/test/constants.py
diff --git a/2.5/test/run-pytest b/2.5/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/2.5/test/test_container_application.py b/2.5/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/2.5/test/test_container_basics.py b/2.5/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/2.5/test/test_container_fips.py b/2.5/test/test_container_fips.py
@@ -0,0 +1 @@
+../../test/test_container_fips.py
diff --git a/2.5/test/test_helm_ruby_imagestreams.py b/2.5/test/test_helm_ruby_imagestreams.py
diff --git a/2.5/test/test_helm_ruby_rails_application.py b/2.5/test/test_helm_ruby_rails_application.py
diff --git a/2.5/test/test_ocp_helm_ruby_imagestreams.py b/2.5/test/test_ocp_helm_ruby_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_helm_ruby_imagestreams.py
diff --git a/2.5/test/test_ocp_helm_ruby_rails_application.py b/2.5/test/test_ocp_helm_ruby_rails_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_helm_ruby_rails_application.py
diff --git a/2.5/test/test_ocp_ruby_ex_standalone.py b/2.5/test/test_ocp_ruby_ex_standalone.py
@@ -0,0 +1 @@
+../../test/test_ocp_ruby_ex_standalone.py
diff --git a/2.5/test/test_ocp_ruby_latest_imagestreams.py b/2.5/test/test_ocp_ruby_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_ruby_latest_imagestreams.py
diff --git a/2.5/test/test_ocp_s2i_imagestreams.py b/2.5/test/test_ocp_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_imagestreams.py
diff --git a/2.5/test/test_ocp_s2i_integration.py b/2.5/test/test_ocp_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_integration.py
diff --git a/2.5/test/test_ocp_s2i_local_templates.py b/2.5/test/test_ocp_s2i_local_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_local_templates.py
diff --git a/2.5/test/test_ocp_s2i_rails_ex_templates.py b/2.5/test/test_ocp_s2i_rails_ex_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_rails_ex_templates.py
diff --git a/2.5/test/test_ruby_ex_standalone.py b/2.5/test/test_ruby_ex_standalone.py
diff --git a/2.5/test/test_ruby_latest_imagestreams.py b/2.5/test/test_ruby_latest_imagestreams.py
diff --git a/2.5/test/test_s2i_imagestreams.py b/2.5/test/test_s2i_imagestreams.py
diff --git a/2.5/test/test_s2i_integration.py b/2.5/test/test_s2i_integration.py
diff --git a/2.5/test/test_s2i_local_templates.py b/2.5/test/test_s2i_local_templates.py
diff --git a/2.5/test/test_s2i_rails_ex_templates.py b/2.5/test/test_s2i_rails_ex_templates.py
diff --git a/3.0/test/conftest.py b/3.0/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/3.0/test/constants.py b/3.0/test/constants.py
diff --git a/3.0/test/run-pytest b/3.0/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/3.0/test/test_container_application.py b/3.0/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/3.0/test/test_container_basics.py b/3.0/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/3.0/test/test_container_fips.py b/3.0/test/test_container_fips.py
@@ -0,0 +1 @@
+../../test/test_container_fips.py
diff --git a/3.0/test/test_helm_ruby_imagestreams.py b/3.0/test/test_helm_ruby_imagestreams.py
diff --git a/3.0/test/test_helm_ruby_rails_application.py b/3.0/test/test_helm_ruby_rails_application.py
diff --git a/3.0/test/test_ocp_helm_ruby_imagestreams.py b/3.0/test/test_ocp_helm_ruby_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_helm_ruby_imagestreams.py
diff --git a/3.0/test/test_ocp_helm_ruby_rails_application.py b/3.0/test/test_ocp_helm_ruby_rails_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_helm_ruby_rails_application.py
diff --git a/3.0/test/test_ocp_ruby_ex_standalone.py b/3.0/test/test_ocp_ruby_ex_standalone.py
@@ -0,0 +1 @@
+../../test/test_ocp_ruby_ex_standalone.py
diff --git a/3.0/test/test_ocp_ruby_latest_imagestreams.py b/3.0/test/test_ocp_ruby_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_ruby_latest_imagestreams.py
diff --git a/3.0/test/test_ocp_s2i_imagestreams.py b/3.0/test/test_ocp_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_imagestreams.py
diff --git a/3.0/test/test_ocp_s2i_integration.py b/3.0/test/test_ocp_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_integration.py
diff --git a/3.0/test/test_ocp_s2i_local_templates.py b/3.0/test/test_ocp_s2i_local_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_local_templates.py
diff --git a/3.0/test/test_ocp_s2i_rails_ex_templates.py b/3.0/test/test_ocp_s2i_rails_ex_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_rails_ex_templates.py
diff --git a/3.0/test/test_ruby_ex_standalone.py b/3.0/test/test_ruby_ex_standalone.py
diff --git a/3.0/test/test_ruby_latest_imagestreams.py b/3.0/test/test_ruby_latest_imagestreams.py
diff --git a/3.0/test/test_s2i_imagestreams.py b/3.0/test/test_s2i_imagestreams.py
diff --git a/3.0/test/test_s2i_integration.py b/3.0/test/test_s2i_integration.py
diff --git a/3.0/test/test_s2i_local_templates.py b/3.0/test/test_s2i_local_templates.py
diff --git a/3.0/test/test_s2i_rails_ex_templates.py b/3.0/test/test_s2i_rails_ex_templates.py
diff --git a/3.1/test/conftest.py b/3.1/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/3.1/test/constants.py b/3.1/test/constants.py
diff --git a/3.1/test/run-pytest b/3.1/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/3.1/test/test_container_application.py b/3.1/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/3.1/test/test_container_basics.py b/3.1/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/3.1/test/test_container_fips.py b/3.1/test/test_container_fips.py
@@ -0,0 +1 @@
+../../test/test_container_fips.py
diff --git a/3.1/test/test_helm_ruby_imagestreams.py b/3.1/test/test_helm_ruby_imagestreams.py
diff --git a/3.1/test/test_helm_ruby_rails_application.py b/3.1/test/test_helm_ruby_rails_application.py
diff --git a/3.1/test/test_ocp_helm_ruby_imagestreams.py b/3.1/test/test_ocp_helm_ruby_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_helm_ruby_imagestreams.py
diff --git a/3.1/test/test_ocp_helm_ruby_rails_application.py b/3.1/test/test_ocp_helm_ruby_rails_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_helm_ruby_rails_application.py
diff --git a/3.1/test/test_ocp_ruby_ex_standalone.py b/3.1/test/test_ocp_ruby_ex_standalone.py
@@ -0,0 +1 @@
+../../test/test_ocp_ruby_ex_standalone.py
diff --git a/3.1/test/test_ocp_ruby_latest_imagestreams.py b/3.1/test/test_ocp_ruby_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_ruby_latest_imagestreams.py
diff --git a/3.1/test/test_ocp_s2i_imagestreams.py b/3.1/test/test_ocp_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_imagestreams.py
diff --git a/3.1/test/test_ocp_s2i_integration.py b/3.1/test/test_ocp_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_integration.py
diff --git a/3.1/test/test_ocp_s2i_local_templates.py b/3.1/test/test_ocp_s2i_local_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_local_templates.py
diff --git a/3.1/test/test_ocp_s2i_rails_ex_templates.py b/3.1/test/test_ocp_s2i_rails_ex_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_rails_ex_templates.py
diff --git a/3.1/test/test_ruby_ex_standalone.py b/3.1/test/test_ruby_ex_standalone.py
diff --git a/3.1/test/test_ruby_latest_imagestreams.py b/3.1/test/test_ruby_latest_imagestreams.py
diff --git a/3.1/test/test_s2i_imagestreams.py b/3.1/test/test_s2i_imagestreams.py
diff --git a/3.1/test/test_s2i_integration.py b/3.1/test/test_s2i_integration.py
diff --git a/3.1/test/test_s2i_local_templates.py b/3.1/test/test_s2i_local_templates.py
diff --git a/3.1/test/test_s2i_rails_ex_templates.py b/3.1/test/test_s2i_rails_ex_templates.py
diff --git a/3.3/test/conftest.py b/3.3/test/conftest.py
@@ -0,0 +1 @@
+../../test/conftest.py
diff --git a/3.3/test/constants.py b/3.3/test/constants.py
diff --git a/3.3/test/run-pytest b/3.3/test/run-pytest
@@ -0,0 +1 @@
+../../test/run-pytest
diff --git a/3.3/test/test_container_application.py b/3.3/test/test_container_application.py
@@ -0,0 +1 @@
+../../test/test_container_application.py
diff --git a/3.3/test/test_container_basics.py b/3.3/test/test_container_basics.py
@@ -0,0 +1 @@
+../../test/test_container_basics.py
diff --git a/3.3/test/test_container_fips.py b/3.3/test/test_container_fips.py
@@ -0,0 +1 @@
+../../test/test_container_fips.py
diff --git a/3.3/test/test_helm_ruby_imagestreams.py b/3.3/test/test_helm_ruby_imagestreams.py
diff --git a/3.3/test/test_helm_ruby_rails_application.py b/3.3/test/test_helm_ruby_rails_application.py
diff --git a/3.3/test/test_ocp_helm_ruby_imagestreams.py b/3.3/test/test_ocp_helm_ruby_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_helm_ruby_imagestreams.py
diff --git a/3.3/test/test_ocp_helm_ruby_rails_application.py b/3.3/test/test_ocp_helm_ruby_rails_application.py
@@ -0,0 +1 @@
+../../test/test_ocp_helm_ruby_rails_application.py
diff --git a/3.3/test/test_ocp_ruby_ex_standalone.py b/3.3/test/test_ocp_ruby_ex_standalone.py
@@ -0,0 +1 @@
+../../test/test_ocp_ruby_ex_standalone.py
diff --git a/3.3/test/test_ocp_ruby_latest_imagestreams.py b/3.3/test/test_ocp_ruby_latest_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_ruby_latest_imagestreams.py
diff --git a/3.3/test/test_ocp_s2i_imagestreams.py b/3.3/test/test_ocp_s2i_imagestreams.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_imagestreams.py
diff --git a/3.3/test/test_ocp_s2i_integration.py b/3.3/test/test_ocp_s2i_integration.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_integration.py
diff --git a/3.3/test/test_ocp_s2i_local_templates.py b/3.3/test/test_ocp_s2i_local_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_local_templates.py
diff --git a/3.3/test/test_ocp_s2i_rails_ex_templates.py b/3.3/test/test_ocp_s2i_rails_ex_templates.py
@@ -0,0 +1 @@
+../../test/test_ocp_s2i_rails_ex_templates.py
diff --git a/3.3/test/test_ruby_ex_standalone.py b/3.3/test/test_ruby_ex_standalone.py
diff --git a/3.3/test/test_ruby_latest_imagestreams.py b/3.3/test/test_ruby_latest_imagestreams.py
diff --git a/3.3/test/test_s2i_imagestreams.py b/3.3/test/test_s2i_imagestreams.py
diff --git a/3.3/test/test_s2i_integration.py b/3.3/test/test_s2i_integration.py
diff --git a/3.3/test/test_s2i_local_templates.py b/3.3/test/test_s2i_local_templates.py
diff --git a/3.3/test/test_s2i_rails_ex_templates.py b/3.3/test/test_s2i_rails_ex_templates.py
diff --git a/test/conftest.py b/test/conftest.py
@@ -0,0 +1,78 @@
+import os
+
+import sys
+
+from pathlib import Path
+from collections import namedtuple
+
+from container_ci_suite.utils import check_variables
+
+PSQL_TAGS = {
+    "rhel8": "-el8",
+    "rhel9": "-el9",
+    "rhel10": "-el10",
+}
+if not check_variables():
+    sys.exit(1)
+
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10",
+}
+TEST_DIR = Path(__file__).parent.absolute()
+APPS = [
+    TEST_DIR / f"{x}test-app"
+    for x in [
+        "",
+        "puma-",
+        "rack-",
+    ]
+]
+Vars = namedtuple(
+    "Vars",
+    [
+        "OS",
+        "TAG",
+        "VERSION",
+        "IMAGE_NAME",
+        "SHORT_VERSION",
+        "TEST_DIR",
+        "APPS",
+        "BRANCH_TO_TEST",
+        "PSQL_TAG",
+        "PSQL_IMAGE_SHORT",
+        "PSQL_IMAGE_TAG",
+    ],
+)
+OS = os.getenv("TARGET").lower()
+VERSION = os.getenv("VERSION")
+PSQL_TAG = PSQL_TAGS.get(OS)
+PSQL_IMAGE_SHORT = f"postgresql:12{PSQL_TAG}"
+PSQL_IMAGE_TAG = f"12{PSQL_TAG}"
+BRANCH_TO_TEST = "master"
+if VERSION == "3.1" or VERSION == "3.3":
+    BRANCH_TO_TEST = "3.3"
+
+VARS = Vars(
+    OS=OS,
+    TAG=TAGS.get(OS),
+    VERSION=VERSION,
+    IMAGE_NAME=os.getenv("IMAGE_NAME"),
+    SHORT_VERSION=VERSION.replace(".", ""),
+    TEST_DIR=TEST_DIR,
+    APPS=APPS,
+    BRANCH_TO_TEST=BRANCH_TO_TEST,
+    PSQL_TAG=PSQL_TAGS.get(OS),
+    PSQL_IMAGE_SHORT=PSQL_IMAGE_SHORT,
+    PSQL_IMAGE_TAG=PSQL_IMAGE_TAG,
+)
+
+
+def fips_enabled():
+    """
+    Check if FIPS is enabled on the system.
+    """
+    if os.path.exists("/proc/sys/crypto/fips_enabled"):
+        return Path("/proc/sys/crypto/fips_enabled").read_text() == "1"
+    return False
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 the MariaDB in format of X.Y
+# 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_helm_ruby_rails_application.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../test/test_ocp_ruby_latest_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