koji: Change release number for NVR #3533
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
ravanelli
commented
Jul 12, 2023
ravanelli
commented
- The release number doesn't need to be random. It make things difficult when we need to search for a NVR name.
- Let's add a common number in oder to make it easier to search for a NVR when we need to.
dustymabe
previously approved these changes
Jul 12, 2023
ravanelli
force-pushed
the
nvr_release
branch
2 times, most recently
from
340b0be
to
5fb0284
Compare
dustymabe
reviewed
Jul 17, 2023
src/cmd-koji-upload
Outdated
Comment on lines
434
to
435
| "release": f"{build.build_id[-1:]}", | ||
| "version": f"{build.build_id[:-2]}", |
There was a problem hiding this comment.
Let's update this to be a little more tolerant if something changes in the future.
For example.. Right now I don't anticipate us ever getting anything other than -0 at the end of a RHCOS build ID, but maybe in the future that could change and we could theoretically get up to -9, -10, etc.
It should be simple to just handle that today if we split based on the -:
[dustymabe@media ~]$ python3
Python 3.11.4 (main, Jun 7 2023, 00:00:00) [GCC 12.3.1 20230508 (Red Hat 12.3.1-1)] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> build_id='414.92.202307170903-0'
>>> version, release = build_id.split('-')
>>> print(version, release)
414.92.202307170903 0
| @@ -429,12 +429,10 @@ class Reserve(_KojiBase): | |||
| """ | |||
| log.info("Reserving a unique koji id") | |||
|
|
|||
There was a problem hiding this comment.
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('-')
dustymabe
reviewed
Jul 17, 2023
src/cmd-koji-upload
Outdated
Comment on lines
653
to
657
| "release": f"{self.build.build_id[-1:]}", | ||
| "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": f"{self.build.build_id[:-2]}" |
There was a problem hiding this comment.
Need to do something similar to #3533 (comment) here
- The release number doesn't need to be random. It makes things difficult when we need to search for a NVR name. - Let's add our "release" version number as release number to make things easier to search for a NVR when we need to. Example: Our full version number is: 413.92.202302162021.0 The Brew version is now: 412.86.202302162021 and the release number is: 0 Signed-off-by: Renata Ravanelli <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.