From b574d8d0b6be1bd37e95d41672c03ee70e0af1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 3 Dec 2024 15:19:14 +0100 Subject: [PATCH] Don't check that jshell is the CMD on SLE 15 SP7+ PR for https://github.com/SUSE/BCI-dockerfile-generator/pull/2109 Co-Authored-By: Dirk Mueller --- tests/test_openjdk_devel.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_openjdk_devel.py b/tests/test_openjdk_devel.py index 8ac5582a..b042b642 100644 --- a/tests/test_openjdk_devel.py +++ b/tests/test_openjdk_devel.py @@ -12,6 +12,7 @@ from bci_tester.data import OPENJDK_DEVEL_11_CONTAINER from bci_tester.data import OPENJDK_DEVEL_17_CONTAINER from bci_tester.data import OPENJDK_DEVEL_21_CONTAINER +from bci_tester.data import OS_VERSION from tests import test_openjdk CONTAINER_TEST_DIR = "/tmp/" @@ -87,6 +88,10 @@ def test_maven_present(auto_container): assert auto_container.connection.run_expect([0], "mvn --version") +@pytest.mark.skipif( + OS_VERSION not in ("15.3", "15.4", "15.5", "15.6"), + reason="jshell is no longer the CMD as of SP7", +) @pytest.mark.parametrize( "container,java_version", # Softfailure for bsc#1221983 only applies to OpenJDK-devel-21