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

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

Requires: https://pagure.io/pungi/pull-request/1626
Requires: https://pagure.io/workstation-ostree-config/pull-request/246
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

Revert "Revert "Use unified core mode for Silverblue & Kinoite""

See: https://pagure.io/pungi-fedora/pull-request/1115
See: https://pagure.io/pungi-fedora/pull-request/1136

This reverts commit dd54ad9f33.

Signed-off-by: Timothée Ravier tim@siosm.fr
This commit is contained in:
Timothée Ravier 2023-02-10 20:57:43 +01:00 committed by kevin
parent 7625f03466
commit 6d82501bca
1 changed files with 4 additions and 0 deletions

View File

@ -752,6 +752,7 @@ ostree = {
"^Silverblue$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True,
"unified_core": True,
"treefile": "fedora-silverblue.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main",
@ -765,6 +766,7 @@ ostree = {
"^Kinoite$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True,
"unified_core": True,
"treefile": "fedora-kinoite.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main",
@ -778,6 +780,7 @@ ostree = {
"^Sericea$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True,
"unified_core": True,
"treefile": "fedora-sericea.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main",
@ -791,6 +794,7 @@ ostree = {
"^Onyx$": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True,
"unified_core": True,
"treefile": "fedora-onyx.yaml",
"config_url": "https://pagure.io/workstation-ostree-config.git",
"config_branch": "main",