Skip to content

cmd-koji-upload: new brew package name for base image builds #4569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaradhak wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

cmd-koji-upload: new brew package name for base image builds #4569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/cmd-koji-upload
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class Build(_Build):
else:
_Build.__init__(self, **kwargs)
self.version, self.release = self.build_id.split('-')
self.name = f"{self.build_name}-{self.basearch}"
self.name = f"{self.build_name}-baseimage-{self.basearch}"
self.source = self.get_meta_key(
"meta", self.ckey("container-config-git"))
self.host_rpms = self.get_rpm_list(RpmListType.HOST)
Expand Down Expand Up @@ -543,12 +543,12 @@ class Reserve(_KojiBase):
log.info("Reserving a unique koji id")

# The koji/brew NVR is constructed like so:
# Name = "rhcos-$arch", like `rhcos-x86_64`
# Name = "rhcos-$arch" for node images, "rhcos-baseimage-$arch" for base images
# Version = Everything before `-` in RHCOS version
# Release = Everything after `-` in RHCOS version
#
# Example: RHCOS Build ID: 414.92.202307170903-0 for x86_64
# Name = rhcos-x86_64
# Name = rhcos-x86_64 (node image) or rhcos-baseimage-x86_64 (base image)
# Version = 414.92.202307170903
# Release = 0
# NVR = rhcos-x86_64-414.92.202307170903-0
Comment on lines +551 to 554

@gemini-code-assist gemini-code-assist Bot Jun 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The NVR example in the comment is incomplete. Since the comment was updated to include the base image name (rhcos-baseimage-x86_64), the NVR example should also be updated to show the resulting NVR for both the node image and the base image to avoid confusion.

Suggested change
# Name = rhcos-x86_64 (node image) or rhcos-baseimage-x86_64 (base image)
# Version = 414.92.202307170903
# Release = 0
# NVR = rhcos-x86_64-414.92.202307170903-0
# Name = rhcos-x86_64 (node image) or rhcos-baseimage-x86_64 (base image)
# Version = 414.92.202307170903
# Release = 0
# NVR = rhcos-x86_64-414.92.202307170903-0 (node image) or rhcos-baseimage-x86_64-414.92.202307170903-0 (base image)

Expand Down Expand Up @@ -778,12 +778,12 @@ class Upload(_KojiBase):

log.debug(f"Preparing manifest for {(len(self.get_image_files(meta=meta)))} files")
# The koji/brew NVR is constructed like so:
# Name = "rhcos-$arch", like `rhcos-x86_64`
# Name = "rhcos-$arch" for node images, "rhcos-baseimage-$arch" for base images
# Version = Everything before `-` in RHCOS version
# Release = Everything after `-` in RHCOS version
#
# Example: RHCOS Build ID: 414.92.202307170903-0 for x86_64
# Name = rhcos-x86_64
# Name = rhcos-x86_64 (node image) or rhcos-baseimage-x86_64 (base image)
# Version = 414.92.202307170903
# Release = 0
# NVR = rhcos-x86_64-414.92.202307170903-0
Comment on lines +786 to 789

@gemini-code-assist gemini-code-assist Bot Jun 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The NVR example in the comment is incomplete. Since the comment was updated to include the base image name (rhcos-baseimage-x86_64), the NVR example should also be updated to show the resulting NVR for both the node image and the base image to avoid confusion.

Suggested change
# Name = rhcos-x86_64 (node image) or rhcos-baseimage-x86_64 (base image)
# Version = 414.92.202307170903
# Release = 0
# NVR = rhcos-x86_64-414.92.202307170903-0
# Name = rhcos-x86_64 (node image) or rhcos-baseimage-x86_64 (base image)
# Version = 414.92.202307170903
# Release = 0
# NVR = rhcos-x86_64-414.92.202307170903-0 (node image) or rhcos-baseimage-x86_64-414.92.202307170903-0 (base image)

Expand Down