davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silverblue/Kinoite/Sericea/Onyx: Use unified core mode

Browse Source 
rpm-ostree is moving to unified core composes and this is now working
for Silverblue, Kinoite, Sericea and Onyx.

See: https://github.com/coreos/rpm-ostree/issues/729
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2150984

Related changes:
- https://pagure.io/workstation-ostree-config/pull-request/246
- https://pagure.io/workstation-ostree-config/pull-request/344

Changes in Pungi:
- https://pagure.io/pungi/pull-request/1626
- https://pagure.io/pungi/pull-request/1690

For previous attempts, see:
- https://pagure.io/pungi-fedora/pull-request/1115
- https://pagure.io/pungi-fedora/pull-request/1136 (revert)
- https://pagure.io/pungi-fedora/pull-request/1145
- https://pagure.io/pungi-fedora/pull-request/1185 (revert)

Signed-off-by: Timothée Ravier tim@siosm.fr
This commit is contained in:
Timothée Ravier 2023-07-19 18:25:18 +02:00
parent 10d4449535
commit ae2c12886a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fedora.conf
View File

@ -752,6 +752,7 @@ ostree = {
"^Silverblue$": { "^Silverblue$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True, "force_new_commit": True,
"unified_core": True,
"treefile": "fedora-silverblue.yaml", "treefile": "fedora-silverblue.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main", "config_branch": "main",
@ -759,12 +760,14 @@ ostree = {
"tag_ref": False, "tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/", "ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/silverblue", "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
"runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64", "ppc64le", "aarch64"], "arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'], "failable": ['*'],
}, },
"^Kinoite$": { "^Kinoite$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True, "force_new_commit": True,
"unified_core": True,
"treefile": "fedora-kinoite.yaml", "treefile": "fedora-kinoite.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main", "config_branch": "main",
@ -772,12 +775,14 @@ ostree = {
"tag_ref": False, "tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/", "ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/kinoite", "ostree_ref": "fedora/rawhide/${basearch}/kinoite",
"runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64", "ppc64le", "aarch64"], "arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'], "failable": ['*'],
}, },
"^Sericea$": { "^Sericea$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True, "force_new_commit": True,
"unified_core": True,
"treefile": "fedora-sericea.yaml", "treefile": "fedora-sericea.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main", "config_branch": "main",
@ -785,12 +790,14 @@ ostree = {
"tag_ref": False, "tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/", "ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/sericea", "ostree_ref": "fedora/rawhide/${basearch}/sericea",
"runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64", "ppc64le", "aarch64"], "arches": ["x86_64", "ppc64le", "aarch64"],
"failable": ['*'], "failable": ['*'],
}, },
"^Onyx$": { "^Onyx$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True, "force_new_commit": True,
"unified_core": True,
"treefile": "fedora-onyx.yaml", "treefile": "fedora-onyx.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git", "config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main", "config_branch": "main",
@ -798,6 +805,7 @@ ostree = {
"tag_ref": False, "tag_ref": False,
"ostree_repo": "/mnt/koji/compose/ostree/repo/", "ostree_repo": "/mnt/koji/compose/ostree/repo/",
"ostree_ref": "fedora/rawhide/${basearch}/onyx", "ostree_ref": "fedora/rawhide/${basearch}/onyx",
"runroot_packages": ["selinux-policy-targeted"],
"arches": ["x86_64"], "arches": ["x86_64"],
"failable": ['*'], "failable": ['*'],
} }