| |
@@ -725,7 +725,6 @@
|
| |
"treefile": "fedora-silverblue.yaml",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
"config_branch": "main",
|
| |
- "repo": "Everything",
|
| |
"tag_ref": False,
|
| |
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
| |
"ostree_ref": "fedora/rawhide/${basearch}/silverblue",
|
| |
@@ -740,7 +739,6 @@
|
| |
"treefile": "fedora-kinoite.yaml",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
"config_branch": "main",
|
| |
- "repo": "Everything",
|
| |
"tag_ref": False,
|
| |
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
| |
"ostree_ref": "fedora/rawhide/${basearch}/kinoite",
|
| |
@@ -755,7 +753,6 @@
|
| |
"treefile": "fedora-sericea.yaml",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
"config_branch": "main",
|
| |
- "repo": "Everything",
|
| |
"tag_ref": False,
|
| |
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
| |
"ostree_ref": "fedora/rawhide/${basearch}/sericea",
|
| |
@@ -770,7 +767,6 @@
|
| |
"treefile": "fedora-onyx.yaml",
|
| |
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
"config_branch": "main",
|
| |
- "repo": "Everything",
|
| |
"tag_ref": False,
|
| |
"ostree_repo": "/mnt/koji/compose/ostree/repo/",
|
| |
"ostree_ref": "fedora/rawhide/${basearch}/onyx",
|
| |
@@ -780,10 +776,44 @@
|
| |
}
|
| |
}
|
| |
|
| |
+ ostree_container = {
|
| |
+ "^Silverblue$": {
|
| |
+ "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
| |
+ "config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
+ "config_branch": "main",
|
| |
+ "treefile": "fedora-silverblue.yaml",
|
| |
+ "arches": ["x86_64", "ppc64le", "aarch64"],
|
| |
+ "failable": ['*'],
|
| |
+ },
|
| |
+ "^Kinoite$": {
|
| |
+ "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
| |
+ "config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
+ "config_branch": "main",
|
| |
+ "treefile": "fedora-kinoite.yaml",
|
| |
+ "arches": ["x86_64", "ppc64le", "aarch64"],
|
| |
+ "failable": ['*'],
|
| |
+ },
|
| |
+ "^Sericea$": {
|
| |
+ "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
| |
+ "config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
+ "config_branch": "main",
|
| |
+ "treefile": "fedora-sericea.yaml",
|
| |
+ "arches": ["x86_64", "aarch64"],
|
| |
+ "failable": ['*'],
|
| |
+ },
|
| |
+ "^Onyx$": {
|
| |
+ "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
| |
+ "config_url": "https://pagure.io/workstation-ostree-config.git",
|
| |
+ "config_branch": "main",
|
| |
+ "treefile": "fedora-onyx.yaml",
|
| |
+ "arches": ["x86_64"],
|
| |
+ "failable": ['*'],
|
| |
+ }
|
| |
+ }
|
| |
+
|
| |
ostree_installer = [
|
| |
("^Silverblue$", {
|
| |
"x86_64": {
|
| |
- "repo": "Everything",
|
| |
"release": None,
|
| |
"rootfs_size": "9",
|
| |
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
| |
@@ -811,7 +841,6 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
"ppc64le": {
|
| |
- "repo": "Everything",
|
| |
"release": None,
|
| |
"rootfs_size": "9",
|
| |
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
| |
@@ -839,7 +868,6 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
"aarch64": {
|
| |
- "repo": "Everything",
|
| |
"release": None,
|
| |
"rootfs_size": "9",
|
| |
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
| |
@@ -869,7 +897,6 @@
|
| |
}),
|
| |
("^Kinoite$", {
|
| |
"x86_64": {
|
| |
- "repo": "Everything",
|
| |
"release": None,
|
| |
"rootfs_size": "10",
|
| |
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
| |
@@ -897,7 +924,6 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
"ppc64le": {
|
| |
- "repo": "Everything",
|
| |
"release": None,
|
| |
"rootfs_size": "10",
|
| |
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
| |
@@ -925,7 +951,6 @@
|
| |
'failable': ['*'],
|
| |
},
|
| |
"aarch64": {
|
| |
- "repo": "Everything",
|
| |
"release": None,
|
| |
"rootfs_size": "10",
|
| |
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
| |
@@ -955,7 +980,6 @@
|
| |
}),
|
| |
("^Sericea$", {
|
| |
"x86_64": {
|
| |
- "repo": "Everything",
|
| |
"release": None,
|
| |
"rootfs_size": "9",
|
| |
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
| |
@@ -983,7 +1007,6 @@
|
| |
}),
|
| |
("^Onyx$", {
|
| |
"x86_64": {
|
| |
- "repo": "Everything",
|
| |
"release": None,
|
| |
"rootfs_size": "9",
|
| |
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
|
| |
fedora.conf: Remove deprecated option in ostree(_installer) phases
This option is deprecated and not needed anymore:
See: https://pagure.io/pungi-fedora/pull-request/1227#comment-196106
Signed-off-by: Timothée Ravier tim@siosm.fr
fedora.conf: Add ostree native container images for Atomic Desktops
See: https://pagure.io/pungi/pull-request/1699
See: https://fedoraproject.org/wiki/Changes/OstreeNativeContainerStable
Signed-off-by: Timothée Ravier tim@siosm.fr