Skip to content

Commit f739e31

Browse files
authored
Merge pull request #971 from SUSE/tests_for_16.0
test fixes for 16.0 containers
2 parents eef6a4d + 849a7c2 commit f739e31

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

tests/test_busybox.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ def test_busybox_provides_sh(auto_container):
2222

2323
#: size limits of the micro image per architecture in MiB
2424
BUSYBOX_IMAGE_MAX_SIZE: Dict[str, int] = {
25-
"x86_64": 16 if OS_VERSION == "tumbleweed" else 13,
26-
"aarch64": 16 if OS_VERSION == "tumbleweed" else 13,
27-
"s390x": 16 if OS_VERSION == "tumbleweed" else 13,
28-
"ppc64le": 16 if OS_VERSION == "tumbleweed" else 13,
25+
"x86_64": 13 if OS_VERSION.startswith("15") else 16,
26+
"aarch64": 13 if OS_VERSION.startswith("15") else 16,
27+
"s390x": 13 if OS_VERSION.startswith("15") else 16,
28+
"ppc64le": 13 if OS_VERSION.startswith("15") else 16,
2929
}
3030

3131

tests/test_go.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
from bci_tester.data import BASE_CONTAINER
1414
from bci_tester.data import GOLANG_CONTAINERS
15+
from bci_tester.data import OS_VERSION
1516
from bci_tester.runtime_choice import DOCKER_SELECTED
1617

1718
#: Maximum go container size in Bytes
@@ -152,6 +153,10 @@ def test_build_generics_cache(
152153
@pytest.mark.skipif(
153154
not DOCKER_SELECTED, reason="Dapper only works with docker"
154155
)
156+
@pytest.mark.skipif(
157+
not OS_VERSION.startswith("15"),
158+
reason="rancher builds only works on SLE15",
159+
)
155160
@pytest.mark.skipif(
156161
LOCALHOST.system_info.arch not in ("x86_64", "aarch64"),
157162
reason=f"{LOCALHOST.system_info.arch} is not supported to build rancher",

0 commit comments

Comments
 (0)