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.

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

config: promote versionary key, rework it #961

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Feb 16, 2024

The versionary FCOS script was one of the few things that differed between FCOS and RHCOS and was awkwardly attached as a hack knob to work.

Now, we promote it to a proper key under the misc section, with support for stream-level overrides. This is prep for also using a versionary in other streams.

The versionary is now part of the source config and cosa knows how to execute it if the --versionary argument is passed.

The versionary FCOS script was one of the few things that differed
between FCOS and RHCOS and was awkwardly attached as a hack knob to
work.

Now, we promote it to a proper key under the `misc` section, with
support for stream-level overrides. This is prep for also using a
versionary in other streams.

The versionary is now part of the source config and cosa knows how to
execute it if the `--versionary` argument is passed.
@jlebon
Copy link
Member Author

jlebon commented Feb 16, 2024

@@ -270,6 +269,8 @@ clouds:

# OPTIONAL: miscellaneous options
misc:
# OPTIONAL: whether to use a versionary to derive version numbers
Copy link
Member

Choose a reason for hiding this comment

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

Is a versionary enough of a noun?

Suggested change
# OPTIONAL: whether to use a versionary to derive version numbers
# OPTIONAL: whether to use a versionary script to derive version numbers

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm trying to make it become one. :) But fine to make it less cool.

Comment on lines +274 to +278
def use_versionary = pipecfg.misc?.versionary
if (stream_info.containsKey('versionary')) {
// stream override always wins
use_versionary = stream_info.versionary
}
Copy link
Member

Choose a reason for hiding this comment

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

i'm guessing if we used this in one other place we'd put a helper function in utils.groovy?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, agree. I don't anticipate that need for now.

@jlebon
Copy link
Member Author

jlebon commented Feb 20, 2024

This needs to wait until coreos/fedora-coreos-config#2859 has made it to stable.

@jlebon jlebon added the hold Waiting for something label Feb 20, 2024
@dustymabe
Copy link
Member

This needs to wait until coreos/fedora-coreos-config#2859 has made it to stable.

or just PR the testing branch and add it so it will be there for the next cycle.

@jlebon
Copy link
Member Author

jlebon commented Feb 20, 2024

This needs to wait until coreos/fedora-coreos-config#2859 has made it to stable.

or just PR the testing branch and add it so it will be there for the next cycle.

WFM. coreos/fedora-coreos-config#2863

@jlebon jlebon removed the hold Waiting for something label Feb 27, 2024
@jlebon
Copy link
Member Author

jlebon commented Feb 27, 2024

The stable branch now has the versionary script!

@jlebon jlebon merged commit 0b39eee into coreos:main Feb 27, 2024
2 checks passed
@jlebon jlebon deleted the pr/versionary-non-hack branch February 27, 2024 15:46
jlebon added a commit to jlebon/coreos-assembler that referenced this pull request Mar 4, 2024
This was moved to coreos/fedora-coreos-config:
coreos/fedora-coreos-config#2859

And the pipeline now knows to use that instead:
coreos/fedora-coreos-pipeline#961
jmarrero pushed a commit to coreos/coreos-assembler that referenced this pull request Mar 6, 2024
This was moved to coreos/fedora-coreos-config:
coreos/fedora-coreos-config#2859

And the pipeline now knows to use that instead:
coreos/fedora-coreos-pipeline#961
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants