We don't have a stable repo, so skip the epel-release 'latest' link for
epel10 for now. Since we don't have any modular stuff left, we can just
reuse that conditional. ;)
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
While EPEL 10 will have minor versions, the repo for the leading minor
version will be published as just the major version. This is because it
is intended for use on CentOS Stream 10, which does not indicate a minor
version within the operating system.
Signed-off-by: Carl George <carlwgeorge@gmail.com>
In c7fbc26afe9f770414a49d150d9072c1e58b21ec I switched an integer 41 to
a string, but didn't notice that it was inside another string as part of
the double templating this file does. This results in a template error:
jinja2.exceptions.TemplateSyntaxError: expected token 'end of statement block', got 'integer'
Other strings inside this bigger string use double instead of single
quotes to handle this, so let's take the same approach on this line.
Signed-off-by: Carl George <carlwgeorge@gmail.com>
EPEL 10 has minor versions, and bodhi's Release.version_int property
doesn't handle versions with a dot correctly (yet). Almost all of our
usage is for constructing strings or for equality comparisons that can
be strings, so we can just use Release.version instead. There is an
instance of a numerical greater than or equal to comparison, but it is
inside a condition for release.id_prefix == 'FEDORA', so it shouldn't
get evaluated for EPEL updates.
Signed-off-by: Carl George <carlwgeorge@gmail.com>
This is a small follow up fix related to 01be34a706.
Previously the script modified a list while iterating through it, which
is always a bad idea, but it didn't throw an error. My last changes
switched it to iterating through a list, which surfaced the flaw as a
RuntimeError. Using a set comprehension is a cleaner way to generate
the set we need to return.
Signed-off-by: Carl George <carlwgeorge@gmail.com>
Originally attempted in 01be34a706, but it
didn't work correctly and needed to be reverted. Some notable
differences this time around:
- Previously the script predicted branch and version based on the tag.
I had this switched to get both of those from the bodhi release, but not
all tags have a corresponding bodhi release. So this now takes a hybrid
approach of using bodhi release if available, and falling back to the
prediction approach otherwise.
- Retired package lists from the lookaside are now skipped if they don't
exist, both during the retrieval and when checked later.
- The get_project_branches function now returns a set.
Signed-off-by: Carl George <carlwgeorge@gmail.com>
The new epel10 release in bodhi is confusing this script, so
lets exclude it for now until we get the script sorted out.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
We changed around compression as part of a Fedora change and move to
createrepo_c > 1.0, but the epel8 repos are causing a bit of problem for
users who use mergerepo_c on them from older (<1.0) createrepo_c.
They can't understand the primary.xml being zstd compressed.
So, lets try and set this to switch primary back to xz.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
You can't nest jinja's templating markers like this, it turns
out, they just wind up as literal strings. You also can't use
f-strings, sadly (tried it locally, it errors out). We have to
use older-style `.format()`, that works. I went with a fairly
explicit syntax to make it clear what's going on.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
Our compose attempt with the containers being built under
Everything didn't go as planned because the filenames of the
container images turn out to be determined by the variant, so
they conflicted and only the last one built survived. So, we
really need to build them under unique variants for now. A
previous commit added the variant definitions.
We don't *need* to build the ostrees under the variants, but it
feels more consistent this way, both with the containers and
with how it works in the Rawhide/Branched composes.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
We repeat this exact same repo definition block eight times,
let's just make it a variable (at the ansible template level).
Signed-off-by: Adam Williamson <awilliam@redhat.com>
As is currently the case for the ostrees themselves. The variants
don't exist in this compose config.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
Since Fedora 40, we've built native OCI containers for the atomic
desktops in the pre-release nightly and release composes. We
should also build native containers in the post-release nightly
composes that Bodhi runs. This should allow us to get rid of the
on-the-fly OCI image generation in the sync-ostree-base-containers
script.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
