forked from roots/phyllomeos
feat: add Fedora 44 support alongside Fedora 43
- add fedora-44-mirrors ingredient and register it in the repository choices - expand the desktop variant matrix to [43, 44, rawhide] (48 dishes) - bump CI workflows and deploy fallback URL to Fedora 44 - cover both release repositories in tests
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
# Fedora 44 repositories
|
||||
|
||||
repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-44&arch=x86_64 # Official Fedora mirror
|
||||
repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f44&arch=x86_64 # Official Fedora updates mirror
|
||||
url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-44&arch=x86_64 # Official Fedora updates mirror
|
||||
@@ -30,6 +30,7 @@ base:
|
||||
choices:
|
||||
repository:
|
||||
"43": repo/fedora-43-mirrors.ks
|
||||
"44": repo/fedora-44-mirrors.ks
|
||||
rawhide: repo/rawhide-mirrors.ks
|
||||
storage:
|
||||
standard: storage/standard.ks
|
||||
|
||||
@@ -4,12 +4,13 @@
|
||||
#
|
||||
# Syntax:
|
||||
# - Single values: repository: "43"
|
||||
# - List values: repository: ["43", "rawhide"] (expands to multiple variants)
|
||||
# - List values: repository: ["43", "44", "rawhide"] (expands to multiple variants)
|
||||
# - Booleans: hardware-support: true / false (feature flags)
|
||||
#
|
||||
# NOTE: List values create a cartesian product.
|
||||
# Example: repository: ["43", "rawhide"] + storage: ["standard", "encrypted"]
|
||||
# creates 4 variants: (43,standard), (43,encrypted), (rawhide,standard), (rawhide,encrypted)
|
||||
# Example: repository: ["43", "44", "rawhide"] + storage: ["standard", "encrypted"]
|
||||
# creates 6 variants: (43,standard), (43,encrypted), (44,standard), (44,encrypted),
|
||||
# (rawhide,standard), (rawhide,encrypted)
|
||||
#
|
||||
# NOTE: The 'name' field prefixes every generated dish/recipe filename, e.g.
|
||||
# the group below yields dishes like desktop_43_gnome_standard_grub_guest-agents.cfg.
|
||||
@@ -18,7 +19,7 @@ recipes:
|
||||
# Desktop variants
|
||||
- name: desktop
|
||||
variants:
|
||||
- repository: ["43", "rawhide"]
|
||||
- repository: ["43", "44", "rawhide"]
|
||||
desktop: gnome
|
||||
storage: ["standard", "encrypted"]
|
||||
bootloader: ["grub", "systemd-boot"]
|
||||
|
||||
@@ -99,6 +99,14 @@ def test_collect_fragments_gnome_standard(templates):
|
||||
assert slug in fragments
|
||||
|
||||
|
||||
@pytest.mark.parametrize("release", ["43", "44"])
|
||||
def test_collect_fragments_release_repository(templates, release):
|
||||
variant = {"repository": release}
|
||||
fragments, problems = gen.collect_fragments(templates, variant)
|
||||
assert problems == []
|
||||
assert f"repo/fedora-{release}-mirrors.ks" in fragments
|
||||
|
||||
|
||||
def test_collect_fragments_choices_default_to_first(templates):
|
||||
variant = {"repository": "43"}
|
||||
fragments, problems = gen.collect_fragments(templates, variant)
|
||||
|
||||
Reference in New Issue
Block a user