Skip to content

Commit 9374a87

Browse files
dirkmuellerdirkmueller
committed
Add SLE16 devel/app container tests
1 parent d9e902c commit 9374a87

File tree

3 files changed

+42
-31
lines changed

3 files changed

+42
-31
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ jobs:
127127
toxenv: ${{fromJson(needs.gentestmatrix.outputs.matrix)}}
128128
os_version:
129129
- 15.7
130+
- "16.0"
130131
- "tumbleweed"
131132
include:
132133
- toxenv: fips

‎bci_tester/data.py‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
)
6262

6363
# Test Language and Application containers by default for these versions
64-
_DEFAULT_NONBASE_SLE_VERSIONS = ("15.7",)
64+
_DEFAULT_NONBASE_SLE_VERSIONS = ("15.7", "16.0")
6565

6666
# Test Language and Application containers by default for these versions
67-
_DEFAULT_NONBASE_OS_VERSIONS = ("15.7", "tumbleweed")
67+
_DEFAULT_NONBASE_OS_VERSIONS = ("15.7", "16.0", "tumbleweed")
6868

6969
# Test base containers by default for these versions
7070
_DEFAULT_BASE_OS_VERSIONS = ("15.6", "15.7", "16.0", "tumbleweed")
@@ -531,13 +531,21 @@ def create_BCI(
531531
create_BCI(
532532
build_tag=f"{BCI_CONTAINER_PREFIX}/golang:{golang_version}",
533533
extra_marks=[pytest.mark.__getattr__(f"golang_{stability}")],
534-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
534+
available_versions=("15.7",),
535535
)
536536
for golang_version, stability in (
537537
("oldstable-openssl", "oldstable"),
538538
("stable-openssl", "stable"),
539539
)
540540
]
541+
+ [
542+
create_BCI(
543+
build_tag=f"{BCI_CONTAINER_PREFIX}/golang:{stability}",
544+
extra_marks=[pytest.mark.__getattr__(f"golang_{stability}")],
545+
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
546+
)
547+
for stability in ("oldstable", "stable")
548+
]
541549
+ [
542550
create_BCI(
543551
build_tag=f"{BCI_CONTAINER_PREFIX}/golang:{golang_version}",
@@ -569,11 +577,11 @@ def create_BCI(
569577
)
570578
OPENJDK_17_CONTAINER = create_BCI(
571579
build_tag="bci/openjdk:17",
572-
available_versions=_DEFAULT_NONBASE_OS_VERSIONS,
580+
available_versions=("15.7", "tumbleweed"),
573581
)
574582
OPENJDK_DEVEL_17_CONTAINER = create_BCI(
575583
build_tag="bci/openjdk-devel:17",
576-
available_versions=_DEFAULT_NONBASE_OS_VERSIONS,
584+
available_versions=("15.7", "tumbleweed"),
577585
custom_entry_point="/bin/sh",
578586
)
579587
OPENJDK_21_CONTAINER = create_BCI(
@@ -628,7 +636,7 @@ def create_BCI(
628636
)
629637
for ver, versions in (
630638
("3.12", ["15.6", "tumbleweed"]),
631-
("3.13", ["15.7", "tumbleweed"]),
639+
("3.13", ["15.7", "16.0", "tumbleweed"]),
632640
)
633641
]
634642

@@ -638,17 +646,17 @@ def create_BCI(
638646
available_versions=versions,
639647
)
640648
for ver, versions in (
641-
("3.6", _DEFAULT_NONBASE_SLE_VERSIONS),
642-
("3.11", _DEFAULT_NONBASE_OS_VERSIONS),
649+
("3.6", ("15.7",)),
650+
("3.11", ("15.7", "tumbleweed")),
643651
)
644652
]
645653

646654
RUBY_25_CONTAINER = create_BCI(
647-
build_tag="bci/ruby:2.5", available_versions=_DEFAULT_NONBASE_SLE_VERSIONS
655+
build_tag="bci/ruby:2.5", available_versions=("15.7",)
648656
)
649657

650658
RUBY_34_CONTAINER = create_BCI(
651-
build_tag="bci/ruby:3.4", available_versions=["15.7"]
659+
build_tag="bci/ruby:3.4", available_versions=_DEFAULT_NONBASE_SLE_VERSIONS
652660
)
653661

654662
RUBY_LATEST_CONTAINER = create_BCI(
@@ -664,32 +672,32 @@ def create_BCI(
664672

665673
DOTNET_SDK_8_0_CONTAINER = create_BCI(
666674
build_tag="bci/dotnet-sdk:8.0",
667-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
675+
available_versions=("15.7",),
668676
extra_marks=(_DOTNET_SKIP_ARCH_MARK,),
669677
)
670678
DOTNET_SDK_9_0_CONTAINER = create_BCI(
671679
build_tag="bci/dotnet-sdk:9.0",
672-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
680+
available_versions=("15.7",),
673681
extra_marks=(_DOTNET_SKIP_ARCH_MARK,),
674682
)
675683
DOTNET_ASPNET_8_0_CONTAINER = create_BCI(
676684
build_tag="bci/dotnet-aspnet:8.0",
677-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
685+
available_versions=("15.7",),
678686
extra_marks=(_DOTNET_SKIP_ARCH_MARK,),
679687
)
680688
DOTNET_ASPNET_9_0_CONTAINER = create_BCI(
681689
build_tag="bci/dotnet-aspnet:9.0",
682-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
690+
available_versions=("15.7",),
683691
extra_marks=(_DOTNET_SKIP_ARCH_MARK,),
684692
)
685693
DOTNET_RUNTIME_8_0_CONTAINER = create_BCI(
686694
build_tag="bci/dotnet-runtime:8.0",
687-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
695+
available_versions=("15.7",),
688696
extra_marks=(_DOTNET_SKIP_ARCH_MARK,),
689697
)
690698
DOTNET_RUNTIME_9_0_CONTAINER = create_BCI(
691699
build_tag="bci/dotnet-runtime:9.0",
692-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
700+
available_versions=("15.7",),
693701
extra_marks=(_DOTNET_SKIP_ARCH_MARK,),
694702
)
695703

@@ -838,11 +846,8 @@ def create_BCI(
838846
),
839847
)
840848

841-
if OS_VERSION in (
842-
"15.6",
843-
"15.7",
844-
):
845-
_GIT_APP_VERSION = "2.43"
849+
if OS_VERSION in ("15.6", "15.7", "16.0"):
850+
_GIT_APP_VERSION = "2"
846851
elif OS_VERSION in ("15.5", "15.4"):
847852
_GIT_APP_VERSION = "2.35"
848853
else:
@@ -870,7 +875,11 @@ def create_BCI(
870875
)
871876
]
872877

873-
_NGINX_APP_VERSION = "latest" if OS_VERSION == "tumbleweed" else "1.21"
878+
_NGINX_APP_VERSION = "latest"
879+
if OS_VERSION in ("16.0",):
880+
_NGINX_APP_VERSION = "1.27"
881+
elif OS_VERSION in ("15.7",):
882+
_NGINX_APP_VERSION = "1.21"
874883

875884
NGINX_CONTAINER = create_BCI(
876885
build_tag=f"{APP_CONTAINER_PREFIX}/nginx:{_NGINX_APP_VERSION}",
@@ -924,7 +933,7 @@ def create_BCI(
924933
)
925934
for gcc_version, os_versions in (
926935
(13, ("tumbleweed",)),
927-
(14, _DEFAULT_NONBASE_OS_VERSIONS),
936+
(14, ("15.7", "tumbleweed")),
928937
(15, ("16.0", "tumbleweed")),
929938
)
930939
]
@@ -992,7 +1001,7 @@ def create_BCI(
9921001
available_versions=versions,
9931002
)
9941003
for tag, versions in (
995-
("0.26", _DEFAULT_NONBASE_SLE_VERSIONS),
1004+
("0.26", ("15.7",)),
9961005
("latest", ("tumbleweed",)),
9971006
)
9981007
]
@@ -1005,7 +1014,7 @@ def create_BCI(
10051014
available_versions=versions,
10061015
)
10071016
for tag, versions in (
1008-
("0.26", _DEFAULT_NONBASE_SLE_VERSIONS),
1017+
("0.26", ("15.7",)),
10091018
("latest", ("tumbleweed",)),
10101019
)
10111020
]
@@ -1017,7 +1026,7 @@ def create_BCI(
10171026
forwarded_ports=[PortForwarding(container_port=3000)],
10181027
available_versions=versions,
10191028
)
1020-
for tag, versions in (("11", _DEFAULT_NONBASE_OS_VERSIONS),)
1029+
for tag, versions in (("11", ("15.7", "tumbleweed")),)
10211030
]
10221031

10231032
OLLAMA_CONTAINER = create_BCI(
@@ -1104,7 +1113,7 @@ def create_BCI(
11041113
create_BCI(
11051114
build_tag=f"{APP_CONTAINER_PREFIX}/kiosk/firefox-esr:esr",
11061115
bci_type=ImageType.APPLICATION,
1107-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
1116+
available_versions=("15.7",),
11081117
custom_entry_point="/bin/sh",
11091118
)
11101119
]
@@ -1113,7 +1122,7 @@ def create_BCI(
11131122
create_BCI(
11141123
build_tag=f"{APP_CONTAINER_PREFIX}/kiosk/pulseaudio:17",
11151124
bci_type=ImageType.APPLICATION,
1116-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
1125+
available_versions=("15.7",),
11171126
custom_entry_point="/bin/sh",
11181127
)
11191128
]
@@ -1122,7 +1131,7 @@ def create_BCI(
11221131
create_BCI(
11231132
build_tag=f"{APP_CONTAINER_PREFIX}/kiosk/xorg:21",
11241133
bci_type=ImageType.APPLICATION,
1125-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
1134+
available_versions=("15.7",),
11261135
custom_entry_point="/bin/sh",
11271136
)
11281137
]
@@ -1131,7 +1140,7 @@ def create_BCI(
11311140
create_BCI(
11321141
build_tag=f"{APP_CONTAINER_PREFIX}/kiosk/xorg-client:21",
11331142
bci_type=ImageType.APPLICATION,
1134-
available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
1143+
available_versions=("15.7",),
11351144
custom_entry_point="/bin/sh",
11361145
)
11371146
]

‎pyproject.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,14 @@ markers = [
9191
'gcc_13',
9292
'gcc_14',
9393
'gcc_15',
94+
'git_2',
9495
'git_2.35',
95-
'git_2.43',
9696
'git_latest',
9797
'helm_3',
9898
'helm_latest',
9999
'milvus_2.4',
100100
'nginx_1.21',
101+
'nginx_1.27',
101102
'nginx_latest',
102103
'golang_oldstable',
103104
'golang_oldstable-openssl',

0 commit comments

Comments
 (0)