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

Ostreecontainer rhel 9 #5399

Merged
merged 6 commits into from
Jan 24, 2024
Merged

Ostreecontainer rhel 9 #5399

merged 6 commits into from
Jan 24, 2024

Conversation

rvykydal
Copy link
Contributor

@rvykydal rvykydal commented Jan 12, 2024 •
edited
Loading

This is a take on port of #4561 to rhel-9 branch.

It could replace the #5277 which is incorporating also some parts of #3234 (updating rpm payload module including the installation method but not actually migrating to it completely).

I am trying to do just a port of the master PR so we can eventually port the #3234 on top of it.

TODO:

  • port the tests
  • test with kickstart tests

@pep8speaks
Copy link

pep8speaks commented Jan 12, 2024 •
edited
Loading

Hello @rvykydal! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 74:100: E501 line too long (102 > 99 characters)

Line 26:100: E501 line too long (100 > 99 characters)
Line 76:100: E501 line too long (103 > 99 characters)
Line 86:100: E501 line too long (108 > 99 characters)

Line 91:100: E501 line too long (159 > 99 characters)
Line 95:100: E501 line too long (159 > 99 characters)
Line 115:100: E501 line too long (106 > 99 characters)
Line 119:100: E501 line too long (106 > 99 characters)

Comment last updated at 2024-01-17 07:57:53 UTC

@rvykydal
Copy link
Contributor Author

The tests are passing for me locally when updating the pykickstart in the CI container to the required version.

@rvykydal rvykydal force-pushed the ostreecontainer-rhel-9 branch 3 times, most recently from 8d43f0f to 3ad22b2 Compare January 12, 2024 11:13
@rvykydal
Add RPM OSTree source from container (#2125655)
617bccb 
RPM OSTree is getting new functionality to use containers as the base
image. Thanks to that it's possible to use standard container
repositories.

This source enables to use these repositories.

Related: RHEL-2250
@rvykydal
Enable RPM OSTree from container source in payload (#2125655)
efd9e4b 
We have a new RPMOStreeContainer source now which enables us to use
containers as installation source. In this commit we adapt the current
rpm_ostree to be able to consume this new container source.

Add a lot of rpm ostree tasks tests for the container source.

Resolves: RHEL-2250
rvykydal and others added 3 commits January 12, 2024 16:29
@rvykydal
Add tests for RPM Ostree payload with source from container (#2125655)
a84b078 
Related: RHEL-2250
@jkonecny12 @rvykydal
Implement needs_network for rpm_ostree_container (#2125655)
d6d512a 
Based on my discussion and recommendation on the bug, the 'registry'
transport should be the only one which needs network to work. Other ways
of transport should be used for local management.

Related: RHEL-2250
@jkonecny12 @rvykydal
Move rpm-ostree deps from Lorax to Anaconda (#2125655)
2b2b9a7 
Our intention is to move dependencies specific for Anaconda execution
from Lorax into Anaconda. Let's do that for rpm-ostree because we need
to also add `skopeo` project to be able to download container images.

Require rpm-ostree version which contains:
- ostreedev/ostree-rs-ext#464 (simplified
syntax)
- ostreedev/ostree-rs-ext#462 (stateroot is not
mandatory)

Related: RHEL-2250
@rvykydal
Copy link
Contributor Author

/build-image --boot-iso

@github-actions GitHub Actions
Copy link

Images built based on commit 2b2b9a7:

  • boot.iso: failure

Download the images from the bottom of the job status page.

@rvykydal
Copy link
Contributor Author

/build-image --boot-iso

@github-actions GitHub Actions
Copy link

Images built based on commit 2b2b9a7:

  • boot.iso: success

Download the images from the bottom of the job status page.

@jkonecny12 jkonecny12 mentioned this pull request Jan 16, 2024
Merged
@rvykydal
Copy link
Contributor Author

/kickstart-test --testtype smoke

@rvykydal
Copy link
Contributor Author

/kickstart-test --testtype payload

@rvykydal
Copy link
Contributor Author

/kickstart-test --testtype packaging

@rvykydal
Copy link
Contributor Author

/kickstart-test --testtype smoke

@rvykydal
Copy link
Contributor Author

/build-image --boot-iso

@github-actions GitHub Actions
Copy link

Images built based on commit d20aa8f:

  • boot.iso: success

Download the images from the bottom of the job status page.

@rvykydal
Copy link
Contributor Author

The PR is passing on ported upstream kickstart test: rhinstaller/kickstart-tests#1041
The ported test has bootloader disabled - it should be handled by followup bootupd work (porting #5342 and related to rhel-9) I believe.

@rvykydal
Copy link
Contributor Author

rvykydal commented Jan 17, 2024 •
edited
Loading

@jkonecny12 we might want to consider Do not crash on default None values of ostreecontainer command also for master to be safer (not crashing on default / missing values in kickstart). It seems it is not an issue on master.

@rvykydal rvykydal marked this pull request as ready for review January 17, 2024 09:45
This was referenced Jan 17, 2024
Closed
Merged
jkonecny12
jkonecny12 approved these changes Jan 22, 2024
View reviewed changes
Copy link
Member

@jkonecny12 jkonecny12 left a comment

Choose a reason for hiding this comment

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

Looks great to me. Thanks!

We should backport the last commit to master :)

@rvykydal rvykydal added the ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). label Jan 22, 2024
@jkonecny12 jkonecny12 mentioned this pull request Jan 22, 2024
Merged
@rvykydal rvykydal mentioned this pull request Jan 24, 2024
Merged
@M4rtinK M4rtinK merged commit cc19258 into rhinstaller:rhel-9 Jan 24, 2024
9 checks passed
@cgwalters
Copy link
Contributor

cgwalters commented Jan 24, 2024 •
edited
Loading

Hm so this didn't roll in #5342 and #5363 though? I think we need those

EDIT: Put up #5423

@cgwalters cgwalters mentioned this pull request Jan 25, 2024
Closed
@poncovka poncovka mentioned this pull request Jan 26, 2024
Merged
@cgwalters
Copy link
Contributor

I'm trying out https://composes.stream.centos.org/development/CentOS-Stream-9-20240226.d.0/compose/BaseOS/x86_64/iso/ and getting an Unknown command: ostreecontainer but it certainly looks to me like that ISO is pulling in an Anaconda with these patches...

@cgwalters cgwalters mentioned this pull request Feb 27, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkonecny12 jkonecny12 jkonecny12 approved these changes

Assignees
No one assigned
Labels
ready to merge The PR can be merged. It should have all BZ flags required for releasing set (usually release+). rhel-9
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rvykydal @pep8speaks @cgwalters @jkonecny12 @M4rtinK