Skip to content
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

Jump to bottom

koji: Change release number for NVR #3533

Merged
merged 1 commit into from
Jul 18, 2023
Merged

koji: Change release number for NVR #3533

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
35 changes: 25 additions & 10 deletions src/cmd-koji-upload
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,12 +429,21 @@ class Reserve(_KojiBase):
"""
log.info("Reserving a unique koji id")

Copy link
Member

Choose a reason for hiding this comment

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

since we are now doing something interesting here when it comes to version and release let's add a comment and the top (I'm sorry I know I asked you to remove the release variable in an earlier iteration of this PR:

# The koji/brew NVR is constructed like so:
# Name = "rhcos-$arch", like `rhcos-x86_64`
# 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
#   Version = 414.92.202307170903
#   Release = 0
#   NVR = rhcos-x86_64-414.92.202307170903-0
version, release = build.build_id.split('-')

release = datetime.datetime.utcnow().strftime("%H%M%S")

# The koji/brew NVR is constructed like so:
# Name = "rhcos-$arch", like `rhcos-x86_64`
# 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
# Version = 414.92.202307170903
# Release = 0
# NVR = rhcos-x86_64-414.92.202307170903-0
version, release = build.build_id.split('-')
data = {
"name": f"{build.build_name}-{build.basearch}",
"release": release,
"version": f"{build.build_id.replace('-', '.')}",
"version": version,
"cg": "coreos-assembler",
}

Expand Down Expand Up @@ -495,7 +504,6 @@ class Upload(_KojiBase):
self._session = None
self._tag = tag
self._image_files = None
self._release = None
self._reserve_id_file = None
self._retry_attempts = 2
self._uploaded = False
Expand Down Expand Up @@ -598,7 +606,6 @@ class Upload(_KojiBase):

now = datetime.datetime.utcnow()
stamp = now.strftime("%s")
self.release = now.strftime("%H%M%S")

"""
Koji has a couple of checks to ensure the reservation data (build_Id, release, name
Expand Down Expand Up @@ -641,6 +648,17 @@ class Upload(_KojiBase):
"meta", self.build.ckey("container-config-git"))

log.debug(f"Preparing manifest for {(len(self.image_files))} files")
# The koji/brew NVR is constructed like so:
# Name = "rhcos-$arch", like `rhcos-x86_64`
# 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
# Version = 414.92.202307170903
# Release = 0
# NVR = rhcos-x86_64-414.92.202307170903-0
version, release = self.build.build_id.split('-')
self._manifest = {
"metadata_version": 0,
"build": {
Expand All @@ -654,14 +672,11 @@ class Upload(_KojiBase):
}
},
"name": f"{self.build.build_name}-{self.build.basearch}",
"release": self._release,
"release": release,
"owner": self._owner,
"source": source['origin'],
"start_time": stamp,
# RHCOS wants to be semver-compatible, but Koji doesn't
# accept `-`. See
# https://github.com/openshift/oc/pull/209#issuecomment-564876535
"version": f"{self.build.build_id.replace('-', '.')}"
"version": version
},
"buildroots": [{
"id": 1,
Expand Down
Loading