fedora.conf: collapse ostree configs into a single entry
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
(cherry picked from commit e57ce07820
)
This commit is contained in:
parent
c23f8b19d3
commit
81da2239d6
72
fedora.conf
72
fedora.conf
@ -747,52 +747,32 @@ live_images = [
|
||||
}),
|
||||
]
|
||||
|
||||
ostree = [
|
||||
("^AtomicHost$", {
|
||||
"aarch64": {
|
||||
"version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
|
||||
"treefile": "fedora-atomic-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"config_branch": "f29",
|
||||
"repo": "Everything",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
|
||||
'failable': ['*'],
|
||||
},
|
||||
"x86_64": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-atomic-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"config_branch": "f29",
|
||||
"repo": "Everything",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
|
||||
'failable': ['*'],
|
||||
},
|
||||
"ppc64le": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-atomic-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"config_branch": "f29",
|
||||
"repo": "Everything",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
|
||||
'failable': ['*'],
|
||||
}
|
||||
}),
|
||||
("^Silverblue$", {
|
||||
"x86_64": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-atomic-workstation.json",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"config_branch": "f29",
|
||||
"repo": "Workstation",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
|
||||
'failable': ['*'],
|
||||
}
|
||||
})
|
||||
]
|
||||
ostree = {
|
||||
"^AtomicHost$": {
|
||||
"version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
|
||||
"treefile": "fedora-atomic-host.json",
|
||||
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||
"config_branch": "f29",
|
||||
"repo": "Everything",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
|
||||
"ostree_ref": "fedora/29/${basearch}/atomic-host",
|
||||
"arches": ["aarch64", "ppc64le", "x86_64"],
|
||||
"failable": ['*'],
|
||||
},
|
||||
"^Silverblue$": {
|
||||
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
|
||||
"treefile": "fedora-atomic-workstation.json",
|
||||
"config_url": "https://pagure.io/workstation-ostree-config.git",
|
||||
"config_branch": "f29",
|
||||
"repo": "Workstation",
|
||||
"tag_ref": False,
|
||||
"ostree_repo": "/mnt/koji/compose/atomic/repo/",
|
||||
"ostree_ref": "fedora/29/${basearch}/silverblue",
|
||||
"arches": ["x86_64"],
|
||||
"failable": ['*'],
|
||||
}
|
||||
}
|
||||
|
||||
ostree_installer = [
|
||||
("^AtomicHost$", {
|
||||
|
Loading…
Reference in New Issue
Block a user