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

jobs/build: add support for reading variant from stream/pipeline config #787

Merged
merged 1 commit into from
Dec 14, 2022

Conversation

marmijo
Copy link
Contributor

@marmijo marmijo commented Dec 12, 2022

Add support in build.jenkinsfile and build-arch.jenkinsfile for reading variant information from the pipeline config/stream and passing it into cosa init.

xref: https://gitlab.cee.redhat.com/coreos/rhcos-devel-pipecfg/-/merge_requests/3 & https://gitlab.cee.redhat.com/coreos/rhcos-art-pipecfg/-/merge_requests/9

See COS-1925

@travier
Copy link
Member

travier commented Dec 13, 2022

Let's not mention any specific variant name in this PR. Something like "Add support for reading variant from the stream/pipecfg config"

@marmijo marmijo changed the title jobs/build: add support for rhcos-9.0 variant jobs/build: add support for reading variant from stream/pipeline config Dec 13, 2022
@jlebon
Copy link
Member

jlebon commented Dec 13, 2022

Can you add documentation for the new knob in docs/config.yaml?

@marmijo
Copy link
Contributor Author

marmijo commented Dec 13, 2022

Can you add documentation for the new knob in docs/config.yaml?

I added a note in the docs about this in the most recent push

@marmijo marmijo requested a review from jlebon December 13, 2022 16:15
@@ -35,6 +35,8 @@ properties([

def build_description = "[${params.STREAM}]"

def stream_info = pipecfg.streams[params.STREAM]
Copy link
Member

Choose a reason for hiding this comment

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

This is already defined lower down.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@@ -41,6 +41,8 @@ properties([

currentBuild.description = "[${params.STREAM}][${params.ARCH}] - ${params.VERSION}"

def variant = stream_info.variant ? "--variant ${stream_info.variant}" : ""
Copy link
Member

Choose a reason for hiding this comment

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

I suppose you meant to define stream_info here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

@@ -42,6 +42,8 @@ properties([

def build_description = "[${params.STREAM}]"

def stream_info = pipecfg.streams[params.STREAM]
Copy link
Member

Choose a reason for hiding this comment

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

This is already defined lower down.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

LGTM! (Just pushed a small update to avoid some unnecessary whitespace changes.)

@jlebon jlebon merged commit 3f39cb0 into coreos:main Dec 14, 2022
@travier
Copy link
Member

travier commented Dec 14, 2022

🎉

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.

None yet

3 participants