From 44861755c3e29ce9303d2ba3d46ef446e99c214a Mon Sep 17 00:00:00 2001 From: Petr Khartskhaev Date: Fri, 13 Mar 2026 12:31:56 +0100 Subject: [PATCH] Remove openshift-4 test symlinks from 4.0, remove skip from s2i_integration pytest --- 4.0/test/test-lib-openshift.sh | 1 - 4.0/test/test-lib-remote-openshift.sh | 1 - 4.0/test/test-openshift.yaml | 1 - test/test_ocp_s2i_integration.py | 2 -- 4 files changed, 5 deletions(-) delete mode 120000 4.0/test/test-lib-openshift.sh delete mode 120000 4.0/test/test-lib-remote-openshift.sh delete mode 120000 4.0/test/test-openshift.yaml diff --git a/4.0/test/test-lib-openshift.sh b/4.0/test/test-lib-openshift.sh deleted file mode 120000 index 4f9f2996..00000000 --- a/4.0/test/test-lib-openshift.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/test-lib-openshift.sh \ No newline at end of file diff --git a/4.0/test/test-lib-remote-openshift.sh b/4.0/test/test-lib-remote-openshift.sh deleted file mode 120000 index 92ad2f4d..00000000 --- a/4.0/test/test-lib-remote-openshift.sh +++ /dev/null @@ -1 +0,0 @@ -../../common/test-lib-remote-openshift.sh \ No newline at end of file diff --git a/4.0/test/test-openshift.yaml b/4.0/test/test-openshift.yaml deleted file mode 120000 index 8613fbba..00000000 --- a/4.0/test/test-openshift.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/test-openshift.yaml \ No newline at end of file diff --git a/test/test_ocp_s2i_integration.py b/test/test_ocp_s2i_integration.py index 040cbc02..7d5171d0 100644 --- a/test/test_ocp_s2i_integration.py +++ b/test/test_ocp_s2i_integration.py @@ -14,8 +14,6 @@ def setup_method(self): """ Setup the test environment. """ - if VARS.VERSION == "4.0": - pytest.skip(f"Skipping s2i integration test for {VARS.VERSION} on {VARS.OS}. The image has not been merged into the repo yet.") self.oc_api = OpenShiftAPI( pod_name_prefix=f"ruby-{VARS.SHORT_VERSION}-testing", version=VARS.VERSION,