Skip to content

Fixups for PR1786#2

Closed
dustymabe wants to merge 10 commits intomasterfrom
PR1786
Closed

Fixups for PR1786#2
dustymabe wants to merge 10 commits intomasterfrom
PR1786

Conversation

@dustymabe
Copy link
Copy Markdown
Owner

No description provided.

dustymabe and others added 10 commits April 7, 2025 11:33
Since the repo has all architectures in it let's move it to the
top global repos list as instructed to do so by the rule in the
comment above the global repo list.
This enables us to build rhel-9.6, c9s, c10s, etc...
There were two mpath iso install tests that were dropped here
that need to be added back.

Also change the link for the tracker for the team and ifcfg denylist
entries because the entries can be dropped when the submodule bump
happens. The other tracker issue is irrelevant because we changed
the definition of the tests.
We now need to support both EL9 and EL10.
Using the conditionnal includes for treefiles
added in [1], update `osversion` to contain the
variant (centos/rhel) and the major version.

This allows the layered build to source
`/etc/release` and include the correct repos.

Update denylist entries to matcht that.

[1] openshift#1780
A few fixups..

- Use "${VAR}" format for osversion= in bash
- Use rhel-9.6-server-ose-4.19-okd repo for c10s for now
Update the image.yaml for c10s and rhel-10.1 to enable EROFS
for the filesystem used for the Live ISO/PXE rootfs.

https://issues.redhat.com/browse/COS-3121
One will be fixed with the next fedora-coreos-config submodule bump and
the other needs a new package build from the maintaining team.
Comment thread extensions/build.sh
Comment on lines +15 to +16
MANIFEST="manifest-c${VERSION_ID}s.yaml"
EXTENSIONS="extensions-okd-c${VERSION_ID}s.yaml"
Copy link
Copy Markdown

@jbtrystram jbtrystram Apr 8, 2025

Choose a reason for hiding this comment

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

Now that i see that I am thinking we should also rename the manifests files to respect $ID-$VERSION so we have consistency all around. WDYT ?

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

honestly I thought about that too, but then things differ from the stream name quite a bit. For centos stream the stream names are c9s and c10s.

I vote we leave them like they are for now and see what @jlebon things when he gets back.

Comment on lines +16 to +22
- rhel-9.6-server-ose-4.19
# XXX: temporarily add rhel-9.4-appstream for crun-wasm since llvm
# libraries can't be found in rhel-9.6-appstream.
# https://github.com/openshift/os/issues/1680
# https://issues.redhat.com/browse/COS-3075
# Repo placed here to respect the rule above.
- rhel-9.4-appstream
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

do we control what packages are pulled from thoses repo if we put them here ?

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

from what @jlebon told me last week any repos specified (even ones only named below in the specific extension metadata) are actually global (only a single transaction gets run when pulling in all extensions).

So.. No, we don't control what packages are pulled from the repos, but we weren't before either.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Ok, if that functionnaly does not change anything, then it's fine by me.

@dustymabe
Copy link
Copy Markdown
Owner Author

pushed the changes here to openshift#1786 so I'll close this out.

@dustymabe dustymabe closed this Apr 8, 2025
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