Skip to content

Commit

Permalink
docker library: ubi now not-10.5/ 11.[12] last release
Browse files Browse the repository at this point in the history
The UBI supported versions no are simplier - they just exclude 10.5.

With 11.1/11.2 releases done there the expression is simplier.
  • Loading branch information
grooverdan committed Nov 26, 2024
1 parent e2c21da commit 77e816d
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,20 +506,11 @@ def hasDockerLibrary(step):
dockerbase = "ubuntu-2004-deb-autobake"
elif fnmatch.fnmatch(branch, "10.11"):
dockerbase = "ubuntu-2204-deb-autobake"
elif fnmatch.fnmatch(branch, "11.[12]"):
dockerbase = "ubuntu-2204-deb-autobake"
else:
dockerbase = "ubuntu-2404-deb-autobake"

# UBI images
if branch in [
"10.6",
"10.11",
"11.4",
"11.5",
"11.6",
"main",
] and builderName.endswith("amd64-rhel-9-rpm-autobake"):
if branch != "10.5" and builderName.endswith("amd64-rhel-9-rpm-autobake"):
return True

# We only build on the above autobakes for all architectures
Expand Down

0 comments on commit 77e816d

Please sign in to comment.