Update configuration for pungi 4.1.9

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Lubomír Sedlář 2016-09-22 14:37:15 +02:00 committed by Dennis Gilmore
parent 1caf794933
commit 16f8055c54

View File

@ -59,8 +59,6 @@ greedy_method = 'build'
#gather_source_mapping = '/path/to/mapping.json' #gather_source_mapping = '/path/to/mapping.json'
link_type = 'hardlink-or-copy'
# CREATEREPO # CREATEREPO
createrepo_c = True createrepo_c = True
createrepo_checksum = 'sha256' createrepo_checksum = 'sha256'
@ -276,7 +274,6 @@ global_target = 'f26'
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',
@ -287,12 +284,12 @@ image_build = {
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Docker_Base' 'subvariant': 'Docker_Base'
'failable': ['*'],
} }
} }
], ],
'^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',
@ -303,10 +300,10 @@ image_build = {
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base' 'subvariant': 'Cloud_Base'
'failable': ['*'],
} }
}, },
{ {
'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',
@ -317,10 +314,13 @@ image_build = {
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Cloud_Base', 'subvariant': 'Cloud_Base',
'failable': ['*'],
} }
'factory-parameters': {
'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'
}
}, },
{ {
'failable': ['*'],
'image-build': { 'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')] 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')]
'name': 'Fedora-Atomic', 'name': 'Fedora-Atomic',
@ -331,10 +331,10 @@ image_build = {
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Atomic' 'subvariant': 'Atomic'
'failable': ['*'],
} }
}, },
{ {
'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-Atomic-Vagrant', 'name': 'Fedora-Atomic-Vagrant',
@ -345,6 +345,7 @@ image_build = {
'repo_from': 'Cloud', 'repo_from': 'Cloud',
'install_tree_from': 'Cloud', 'install_tree_from': 'Cloud',
'subvariant': 'Atomic' 'subvariant': 'Atomic'
'failable': ['*'],
} }
'factory-parameters': { 'factory-parameters': {
'ova-option': 'vagrant_sync_directory=/home/vagrant/sync' 'ova-option': 'vagrant_sync_directory=/home/vagrant/sync'