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

fix up the beta config to validae with pungi 4.1.9

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2016-10-04 20:40:33 -05:00
parent 51e7da5e63
commit 2ce4e4fd64
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fedora-beta.conf
View File

@ -42,8 +42,6 @@ pkgset_source = 'koji' # koji, repos
# pkgset_repos = {} # pkgset_repos = {}
# PKGSET - KOJI # PKGSET - KOJI
pkgset_koji_path_prefix = '/mnt/koji/'
pkgset_koji_url = 'http://koji.fedoraproject.org/kojihub'
pkgset_koji_tag = 'f25-compose' pkgset_koji_tag = 'f25-compose'
pkgset_koji_inherit = True pkgset_koji_inherit = True
@ -63,10 +61,6 @@ greedy_method = 'build'
#gather_source_mapping = '/path/to/mapping.json' #gather_source_mapping = '/path/to/mapping.json'
link_files = 'hardlink-or-copy'
notification_script = '/usr/bin/pungi-fedmsg-notification'
# CREATEREPO # CREATEREPO
createrepo_c = True createrepo_c = True
createrepo_checksum = 'sha256' createrepo_checksum = 'sha256'
@ -75,7 +69,7 @@ createrepo_deltas = True
# CHECKSUMS # CHECKSUMS
media_checksums = ['sha256'] media_checksums = ['sha256']
media_checksum_one_file = True media_checksum_one_file = True
media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-1.1-%(arch)s' media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(label)s-%(arch)s'
#jigdo #jigdo
create_jigdo = False create_jigdo = False
@ -235,7 +229,7 @@ createiso_skip = [
#] #]
# Image name respecting Fedora's image naming policy # Image name respecting Fedora's image naming policy
image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-1.1.iso' image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(label)s.iso'
# # Use the same format for volume id # # Use the same format for volume id
image_volid_formats = [ image_volid_formats = [
'%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
@ -284,11 +278,11 @@ global_target = 'f25'
image_build = { image_build = {
'^Docker$': [ '^Docker$': [
{ {
'failable': ['*'],
'image-build': { 'image-build': {
'format': [('docker', 'tar.xz')] 'format': [('docker', 'tar.xz')]
'name': 'Fedora-Docker-Base', 'name': 'Fedora-Docker-Base',
'kickstart': 'fedora-docker-base.ks', 'kickstart': 'fedora-docker-base.ks',
'failable': ['*'],
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 3, 'disk_size': 3,
'arches': ['x86_64', 'armhfp'], 'arches': ['x86_64', 'armhfp'],
@ -300,11 +294,11 @@ image_build = {
], ],
'^CloudImages$': [ '^CloudImages$': [
{ {
'failable': ['*'],
'image-build': { 'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')] 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Cloud-Base', 'name': 'Fedora-Cloud-Base',
'kickstart': 'fedora-cloud-base.ks', 'kickstart': 'fedora-cloud-base.ks',
'failable': ['*'],
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 3, 'disk_size': 3,
'arches': ['x86_64'], 'arches': ['x86_64'],
@ -314,11 +308,11 @@ image_build = {
} }
}, },
{ {
'failable': ['*'],
'image-build': { 'image-build': {
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')] 'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Cloud-Base-Vagrant', 'name': 'Fedora-Cloud-Base-Vagrant',
'kickstart': 'fedora-cloud-base-vagrant.ks', 'kickstart': 'fedora-cloud-base-vagrant.ks',
'failable': ['*'],
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 40, 'disk_size': 40,
'arches': ['x86_64'], 'arches': ['x86_64'],
@ -564,7 +558,6 @@ ostree_installer = [
"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-%(date)s.iso",
"installpkgs": ["fedora-productimg-atomic"], "installpkgs": ["fedora-productimg-atomic"],
"add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"], "add_template": ["workstation-ostree-installer/lorax-configure-repo.tmpl"],
"add_template_var": [ "add_template_var": [
@ -585,5 +578,4 @@ ostree_installer = [
] ]
release_id_allow_missing = True
koji_profile = 'koji' koji_profile = 'koji'