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

renable ostree deliverables, enable docker base images for arm

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-04-08 10:18:48 -05:00
parent 57fef86770
commit de86c341c1
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
fedora.conf
View File

@ -287,7 +287,7 @@ image_build = {
'kickstart': 'fedora-docker-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
'arches': ['x86_64'],
'arches': ['x86_64', 'armv7hl'],
'repo_from': 'Cloud',
'install_tree_from': 'Cloud',
'subvariant': 'Docker_Base'
@ -558,38 +558,38 @@ live_images = [
}),
]
#ostree = [
# ("^Atomic$", {
# "x86_64": {
# "treefile": "fedora-atomic-docker-host.json",
# "config_url": "https://pagure.io/fedora-atomic.git",
# "source_repo_from": "Everything",
# "ostree_repo": "/mnt/koji/compose/atomic/rawhide/"
# }
# })
#]
ostree = [
("^Atomic$", {
"x86_64": {
"treefile": "fedora-atomic-docker-host.json",
"config_url": "https://pagure.io/fedora-atomic.git",
"source_repo_from": "Everything",
"ostree_repo": "/mnt/koji/compose/atomic/rawhide/"
}
})
]
#ostree_installer = [
# ("^Atomic$", {
# "x86_64": {
# "source_repo_from": "Everything",
# "release": None,
# "filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso",
# "installpkgs": ["fedora-productimg-atomic"],
# "add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
# "add_template_var": [
# "ostree_osname=fedora-atomic",
# "ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
# ],
# "add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
# "add_arch_template_var": [
# "ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
# "ostree_osname=fedora-atomic",
# "ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
# ]
# }
# })
#]
ostree_installer = [
("^Atomic$", {
"x86_64": {
"source_repo_from": "Everything",
"release": None,
"filename": "%(release_short)s-%(variant)s-%(arch)s-%(version)s-%(compose_date)s.iso",
"installpkgs": ["fedora-productimg-atomic"],
"add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
"add_template_var": [
"ostree_osname=fedora-atomic",
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
],
"add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
"add_arch_template_var": [
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/",
"ostree_osname=fedora-atomic",
"ostree_ref=fedora-atomic/rawhide/x86_64/docker-host",
]
}
})
]
release_id_allow_missing = True
koji_profile = 'koji'