Skip to content

Commit eadee80

Browse files
authored
Merge pull request #1025 from SUSE/thirdparty_sle16
Adjust paths for 3rd party container tests on 16.0
2 parents cceb42e + 4b2e08c commit eadee80

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

bci_tester/data.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@
190190
if BASEURL.endswith("/"):
191191
BASEURL = BASEURL[:-1]
192192
else:
193-
if OS_VERSION in ("tumbleweed", "16.0", "16.1"):
194-
DISTNAME = OS_VERSION
193+
if OS_VERSION in ("tumbleweed",) or OS_VERSION.startswith("16."):
194+
DISTNAME = OS_VERSION.partition("-")[0]
195195
else:
196196
DISTNAME = f"sle-{OS_MAJOR_VERSION}-sp{OS_SP_VERSION}"
197197

@@ -202,18 +202,22 @@
202202
obs_project: str = f"registry.opensuse.org/devel/bci/{DISTNAME}"
203203
if OS_VERSION == "16.0-pc2025":
204204
ibs_cr_project = "registry.suse.de/suse/slfo/products/publiccloud/toolchain/2025/totest"
205+
elif OS_VERSION in ("15.7-third-party", "16.0-third-party"):
206+
ibs_project = (
207+
f"registry.suse.de/product/suse-containers-thirdparty/{DISTNAME}"
208+
)
209+
ibs_cr_project = (
210+
f"registry.suse.de/product/suse-containers-thirdparty/{DISTNAME}/test"
211+
if OS_VERSION == "16.0-third-party"
212+
else f"registry.suse.de/product/suse-containers-thirdparty/{DISTNAME}/totest"
213+
)
205214
elif OS_VERSION.startswith("16"):
206215
ibs_cr_project = (
207216
f"registry.suse.de/suse/slfo/products/bci/{DISTNAME}/test"
208217
)
209218
elif OS_VERSION in ("15.6-spr", "15.7-spr"):
210219
ibs_cr_project = f"registry.suse.de/suse/{DISTNAME}/update/products/privateregistry/totest"
211220
obs_project = "registry.suse.de/devel/scc/privateregistry"
212-
elif OS_VERSION in ("15.7-third-party", "16.0-third-party"):
213-
ibs_project = (
214-
f"registry.suse.de/product/suse-containers-thirdparty/{DISTNAME}"
215-
)
216-
ibs_cr_project = f"registry.suse.de/product/suse-containers-thirdparty/{DISTNAME}/totest"
217221

218222
BASEURL = {
219223
"obs": obs_project,

0 commit comments

Comments
 (0)