renable ostree deliverables, enable docker base images for arm
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
parent
57fef86770
commit
de86c341c1
64
fedora.conf
64
fedora.conf
@ -287,7 +287,7 @@ image_build = {
|
|||||||
'kickstart': 'fedora-docker-base.ks',
|
'kickstart': 'fedora-docker-base.ks',
|
||||||
'distro': 'Fedora-20',
|
'distro': 'Fedora-20',
|
||||||
'disk_size': 3,
|
'disk_size': 3,
|
||||||
'arches': ['x86_64'],
|
'arches': ['x86_64', 'armv7hl'],
|
||||||
'repo_from': 'Cloud',
|
'repo_from': 'Cloud',
|
||||||
'install_tree_from': 'Cloud',
|
'install_tree_from': 'Cloud',
|
||||||
'subvariant': 'Docker_Base'
|
'subvariant': 'Docker_Base'
|
||||||
@ -558,38 +558,38 @@ live_images = [
|
|||||||
}),
|
}),
|
||||||
]
|
]
|
||||||
|
|
||||||
#ostree = [
|
ostree = [
|
||||||
# ("^Atomic$", {
|
("^Atomic$", {
|
||||||
# "x86_64": {
|
"x86_64": {
|
||||||
# "treefile": "fedora-atomic-docker-host.json",
|
"treefile": "fedora-atomic-docker-host.json",
|
||||||
# "config_url": "https://pagure.io/fedora-atomic.git",
|
"config_url": "https://pagure.io/fedora-atomic.git",
|
||||||
# "source_repo_from": "Everything",
|
"source_repo_from": "Everything",
|
||||||
# "ostree_repo": "/mnt/koji/compose/atomic/rawhide/"
|
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/"
|
||||||
# }
|
}
|
||||||
# })
|
})
|
||||||
#]
|
]
|
||||||
|
|
||||||
#ostree_installer = [
|
ostree_installer = [
|
||||||
# ("^Atomic$", {
|
("^Atomic$", {
|
||||||
# "x86_64": {
|
"x86_64": {
|
||||||
# "source_repo_from": "Everything",
|
"source_repo_from": "Everything",
|
||||||
# "release": None,
|
"release": None,
|
||||||
# "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso",
|
"filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso",
|
||||||
# "installpkgs": ["fedora-productimg-atomic"],
|
"installpkgs": ["fedora-productimg-atomic"],
|
||||||
# "add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
|
"add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
|
||||||
# "add_template_var": [
|
"add_template_var": [
|
||||||
# "ostree_osname=fedora-atomic",
|
"ostree_osname=fedora-atomic",
|
||||||
# "ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
|
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
|
||||||
# ],
|
],
|
||||||
# "add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
|
"add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
|
||||||
# "add_arch_template_var": [
|
"add_arch_template_var": [
|
||||||
# "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
|
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
|
||||||
# "ostree_osname=fedora-atomic",
|
"ostree_osname=fedora-atomic",
|
||||||
# "ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
|
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
|
||||||
# ]
|
]
|
||||||
# }
|
}
|
||||||
# })
|
})
|
||||||
#]
|
]
|
||||||
|
|
||||||
release_id_allow_missing = True
|
release_id_allow_missing = True
|
||||||
koji_profile = 'koji'
|
koji_profile = 'koji'
|
||||||
|
Loading…
Reference in New Issue
Block a user