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

Add sysconfig stage #1188

Merged
merged 4 commits into from Feb 9, 2021
Merged

Add sysconfig stage #1188

merged 4 commits into from Feb 9, 2021

Conversation

jkozol
Copy link
Member

@jkozol jkozol commented Jan 29, 2021

This pull request includes:

  • adequate testing for the new functionality or fixed issue
  • adequate documentation informing people about the change

The org.osbuild.sysconfig stage is now supported. Config updates can be made to the kernel and network files. Currently, only the default values are used for all image types in rhel84. The image-info script is updated to allow testing the sysconfig info.

The default values are:

  kernel:
    UPDATEDEFAULT=yes
    DEFAULTKERNEL=kernel
    
  network:
    NETWORKING=yes
    NOZEROCONF=yes

@jkozol jkozol requested review from teg and gicmo January 29, 2021 15:10
gicmo
gicmo suggested changes Jan 30, 2021
View reviewed changes
Copy link
Contributor

@gicmo gicmo left a comment

Choose a reason for hiding this comment

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

Overall looks good to me! I wonder if in the case of OSTree commits they should really go into the commit itself.

tools/image-info Outdated Show resolved Hide resolved
tools/image-info Show resolved Hide resolved
@gicmo
Copy link
Contributor

gicmo commented Jan 30, 2021

Schutzi is unhappy because the osbuild requirements was not updated so the sysconfig stage is actually not there, hence you get missing schema errors.

@gicmo
Copy link
Contributor

gicmo commented Jan 30, 2021

One other little other thing, in your commit you write:

Currently, only the default values are used for all image types in rhel84.

I stumbled a bit over default, since if they were the default we would not have to set them, right?

@jkozol jkozol force-pushed the addSysconfigStage branch 3 times, most recently from a5dc9d1 to 43c8329 Compare February 1, 2021 15:45
@jkozol
Copy link
Member Author

jkozol commented Feb 1, 2021

I stumbled a bit over default, since if they were the default we would not have to set them, right?

@gicom I see what you're saying here. I changed the wording to just indicate that we are setting values for all rhel 8.4 image types.

@achilleas-k achilleas-k mentioned this pull request Feb 1, 2021
Merged
2 tasks
teg
teg previously approved these changes Feb 1, 2021
View reviewed changes
Copy link
Member

@teg teg left a comment

Choose a reason for hiding this comment

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

Great work @jkozol! Make sure to sync with @thozza on the merge conflicts, but as soon as that is taken care of and schutzbot is happy I think this is ready to be merged!

gicmo
gicmo reviewed Feb 1, 2021
View reviewed changes
test/data/manifests/rhel_84-x86_64-vhd-boot.json Outdated
Comment on lines 9766 to 10276
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets hope David doesn't see this :P

Copy link
Member Author

Choose a reason for hiding this comment

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

hahaha shhhh. It's the test generator's fault...

@gicmo
Copy link
Contributor

gicmo commented Feb 1, 2021

@gicom

That's not my name! sing 😄

@ondrejbudai
Copy link
Member

Blocked until osbuild 24 is in both Fedora 32 and Fedora 33:

https://bodhi.fedoraproject.org/updates/FEDORA-2021-1f28f28ea7
https://bodhi.fedoraproject.org/updates/FEDORA-2021-1f070f8684

@gicmo
Copy link
Contributor

gicmo commented Feb 2, 2021

Blocked until osbuild 24 is in both Fedora 32 and Fedora 33:

https://bodhi.fedoraproject.org/updates/FEDORA-2021-1f28f28ea7
https://bodhi.fedoraproject.org/updates/FEDORA-2021-1f070f8684

On its way now for F33, but needs karma or time for F32.

@jkozol
Copy link
Member Author

jkozol commented Feb 2, 2021

Also blocked until osbuild 24 is in rhel 8.4 nightly.

@ondrejbudai ondrejbudai added the blocked Issues / PRs blocked by something label Feb 3, 2021
@jkozol
spec: update to osbuild version 24
e5e1f0f 
In order to add the newly supported sysconfig stage, the osbuild
dependency needs to be updated to version 24. The version is updated to
24 in the specfile and README. Also, for testing purposes, the Schutzfile
now points to the commit hash for osbuild version 24 for rhel-8.3 tests.
@jkozol
docs/news: update osbuild to version 24
e0be326
@jkozol
distro/rhel84: add sysconfig stage
a837443 
The org.osbuild.sysconfig stage is now supported. Config updates can be
made to the kernel and network files. Currently, the same values are
used for all image types in rhel84. The image-info script is updated to
allow testing the sysconfig info.
@jkozol
docs/news: rhel84 add support for org.osbuild.sysconfig stage
327f82c
@jkozol
Copy link
Member Author

jkozol commented Feb 8, 2021

Just an update. The latest version of osbuild is now in the RHEL 8.4 nightly. Just waiting on f32 to make it into stable. It is currently on its magical journey from testing to stable. After this all the tests should pass.

@thozza thozza mentioned this pull request Feb 9, 2021
Merged
2 tasks
@gicmo gicmo removed the blocked Issues / PRs blocked by something label Feb 9, 2021
@gicmo
Copy link
Contributor

gicmo commented Feb 9, 2021

Not blocked anymore as osbuild 24 should have made it to stable everywhere, restarting Schutzi.

gicmo
gicmo approved these changes Feb 9, 2021
View reviewed changes
Copy link
Contributor

@gicmo gicmo left a comment

Choose a reason for hiding this comment

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

🙆

@jkozol jkozol merged commit 56c4922 into osbuild:main Feb 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gicmo gicmo gicmo approved these changes

@teg teg teg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jkozol @gicmo @ondrejbudai @teg