many: take repositories from the "images" library #4554
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mvo5
force-pushed
the
use-vendor-repos
branch
3 times, most recently
from
15a7a63 to
ad41d86
Compare
mvo5
added a commit
to mvo5/images
that referenced
this pull request
Jan 29, 2025
This is a mirror of osbuild/osbuild-composer#4578 to update the gpg keys. Once osbuild/osbuild-composer#4554 is merged there should be no drift anymore.
mvo5
force-pushed
the
use-vendor-repos
branch
5 times, most recently
from
0a86a28 to
e0743e2
Compare
github-merge-queue bot
pushed a commit
to osbuild/images
that referenced
this pull request
Jan 29, 2025
This is a mirror of osbuild/osbuild-composer#4578 to update the gpg keys. Once osbuild/osbuild-composer#4554 is merged there should be no drift anymore.
mvo5
force-pushed
the
use-vendor-repos
branch
from
e0743e2 to
68b18bb
Compare
mvo5
commented
Jan 30, 2025
mvo5
force-pushed
the
use-vendor-repos
branch
from
68b18bb to
c4c809d
Compare
mvo5
commented
Jan 30, 2025
repositories/README.md
Outdated
|
|
||
| Most are imported via the "vendor" mechanism, but some special | ||
| repositories are kept here, like the `*-no-aux-key.json` that | ||
| is only installed on rhel-8. |
There was a problem hiding this comment.
This is not true and needs to be "-no-aux-keys.json" is only installed on rhel-10
There was a problem hiding this comment.
True, this is a typo. Those are el8 repos installed only on el10.
There was a problem hiding this comment.
Fixed this now with a better explaination.
This commit changes the spec file so that most of the repositories are taken from the `images` library. See images PR#1112 for details. Note that we still need the -no-auth-keys and the centos-stream symlinks.
This commit runs go mod to get the latest changes.
This commit updates the cloudapi test that uses the real repositories to use the version of those from the "images" library. Composer no longer carries the default repos. Note that this can most likely be simplified once osbuild/images#1179 is merged.
mvo5
force-pushed
the
use-vendor-repos
branch
from
c4c809d to
7722d3e
Compare
|
Note that we added fedora-42 to the repositories in "images" recently (c.f. osbuild/images#1183) - having this PR would mean we get the update automatically :) |
thozza
reviewed
Jan 31, 2025
| %endif | ||
|
|
||
| %else | ||
|
|
||
| %if 0%{?rhel} | ||
| # RHEL 10 supports building all RHEL versions | ||
| %if 0%{?rhel} >= 10 | ||
| for REPO_FILE in $(ls repositories/rhel-* | grep -v 'no-aux-key'); do | ||
| for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-* | grep -v 'no-aux-key'); do |
There was a problem hiding this comment.
Calling grep is no longer needed since there are no -no-aux-key repos in `images, right?
| @@ -183,13 +184,13 @@ done | |||
|
|
|||
| %else | |||
| # All other RHEL versions support building for the same version | |||
| for REPO_FILE in $(ls repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do | |||
| for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-%{rhel}* | grep -v 'no-aux-key'); do | |||
There was a problem hiding this comment.
Calling grep is no longer needed since there are no -no-aux-key repos in `images, right?
| install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE}) | ||
| done | ||
|
|
||
| # RHEL 9 supports building also for RHEL 8 | ||
| %if 0%{?rhel} == 9 | ||
| for REPO_FILE in $(ls repositories/rhel-8* | grep -v 'no-aux-key'); do | ||
| for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-8* | grep -v 'no-aux-key'); do |
There was a problem hiding this comment.
Calling grep is no longer needed since there are no -no-aux-key repos in `images, right?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit changes the spec file so that most of the repositories are taken from the
imageslibrary. See images PR#1112 for details.Note that we still need the -no-auth-keys and the centos-stream symlinks - and we probably need to think about the handling of -no-auth-keys and if it could move under a different "tree" in images or something (like github.com/osbuild/images/data/repositories for the general case and github.com/osbuild/images/data/repositories/no-aux-keys subdir with the same file names or even repositories/for-rhel10 or something like this) but this should be ready for a first round of reviews now.
(see osbuild/images#1112)